August 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 ) Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... Patch Set 4: (2 comments) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/129ec082_9e79a90b PS2, Line 559: if (!pch->confirm) > I'm not really following. […] In the current implementation we always include RSL_IE_ERIC_MOBILE_ID when sending the IMMEDIATE ASSIGNMENT COMMAND. I have checked some of my notes again and as far as I understand this is indeed an optional field. So if we want a confirmation from the BTS we include this field. If we don't want a confirmation, we just leave it away. I quickly changed the implementation of abis_rsl:rsl_ericsson_imm_assign_cmd() so that we can select if we want a confirmation or not. This also means that we now have the same behavior as we have in osmo-bts. https://gerrit.osmocom.org/c/osmo-bsc/+/34192/comment/fc9dbcc5_ba227a61 PS2, Line 566: if (pch->confirm) > Just send the confirmation when you transmit the related block over RSL. […] Ok, I added this. So in that regard the behavior is now (almost) exactly like the one of osmo-bts. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:45:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch

by dexter

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 to look at the new patch set (#4). Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch ...................................................................... pcuif_proto: check confirm flag in struct gsm_pcu_if_pch Since osmo-bsc uses RSL (with a propritary Ericsson RBS specific extension) to send a confirmed IMMEDIATE ASSIGNMENT messages via PCH, we can not just forward the MAC blocks into the paging queue without determining whether the MAC block is a PAGING message or an IMMEDIATE ASSIGNMENT message. the reason for this is that RSL uses two different message types (IMMEDIATE ASSIGNMENT COMMAND and PAGING COMMAND) to process IMMEDIATE ASSIGNMENT and PAGING messages. This means we have to look into the MAC block to make sure whether the message is a PAGING message or an IMMEDIATE ASSIGNMENT message. We also need to make sure that the confirm flag is properly executed. In the case of the IMMEDIATE ASSIGNMENT this means we have to include (confirm=true) or not include (confirm=false) the RSL_IE_ERIC_MOBILE_ID into the IMMEDIATE ASSIGNMENT COMMAND message. In the case of PAGING we directly echo a confirmation after sending the PAGING COMMAND via RSL when a confirmation is requested. Related: OS#5927 Depends: osmo-pcu.git Ia202862aafc1f0cb6601574ef61eb9155de11f04 Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/pcu_sock.c 4 files changed, 51 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/34192/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0 Gerrit-Change-Number: 34192 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 to look at the new patch set (#4). Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH In PCUIF v.11 we use PCU_IF_SAPI_AGCH_2 exclusively. We use this SAPI to transfer IMMEDIATE ASSIGNMENT messages for uplink and downlink. One new feature of PCU_IF_SAPI_AGCH_2 is that the PCU may ask to send a confirmation when the MAC block is sent. CAUTION: This patch breaks compatibility to current master osmo-pcu (See also "Depends") Related: OS#5927 Depends: osmo-pcu.git I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c --- M include/osmocom/bsc/pcu_if.h M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/pcu_sock.c 4 files changed, 57 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/34060/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: meas_feed: Refactor fd/wqueue lifecycle

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34243 ) Change subject: meas_feed: Refactor fd/wqueue lifecycle ...................................................................... meas_feed: Refactor fd/wqueue lifecycle The previous checks had several rough edges which may end up in unexpected behaviors, specially with fd=0 vs fd=-1. The new code is much more robust. Furthermore, we are not longer enqueueing measurements in the queue if it has not yet been enabled/initialized. Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f --- M src/osmo-bsc/meas_feed.c 1 file changed, 51 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34243/1 diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index afd96e1..41df4ea 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -29,7 +29,9 @@ uint16_t dst_port; }; -static struct meas_feed_state g_mfs = {}; +static struct meas_feed_state g_mfs = { + .wqueue.bfd.fd = -1, +}; static int process_meas_rep(struct gsm_meas_rep *mr) { @@ -37,6 +39,10 @@ struct meas_feed_meas *mfm; struct bsc_subscr *bsub; + /* meas-feed not enabled/initialized, do nothing */ + if (g_mfs.wqueue.bfd.fd == -1) + return 0; + /* ignore measurements as long as we don't know who it is */ if (!mr->lchan) { LOGP(DMEAS, LOGL_DEBUG, "meas_feed: no lchan, not sending report\n"); @@ -49,7 +55,7 @@ bsub = mr->lchan->conn->bsub; - msg = msgb_alloc(sizeof(struct meas_feed_meas), "Meas. Feed"); + msg = msgb_alloc(sizeof(struct meas_feed_meas), "meas_feed_msg"); if (!msg) return 0; @@ -125,46 +131,45 @@ return rc; } +static void meas_feed_close(void) +{ + if (g_mfs.wqueue.bfd.fd == -1) + return; + osmo_wqueue_clear(&g_mfs.wqueue); + osmo_fd_unregister(&g_mfs.wqueue.bfd); + close(g_mfs.wqueue.bfd.fd); + g_mfs.wqueue.bfd.fd = -1; +} + int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port) { int rc; - int already_initialized = 0; - if (g_mfs.wqueue.bfd.fd) - already_initialized = 1; - - - if (already_initialized && - !strcmp(dst_host, g_mfs.dst_host) && - dst_port == g_mfs.dst_port) - return 0; - - if (!already_initialized) { - osmo_wqueue_init(&g_mfs.wqueue, 10); - g_mfs.wqueue.write_cb = feed_write_cb; - g_mfs.wqueue.read_cb = feed_read_cb; - osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); - LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); + /* Already initialized */ + if (g_mfs.wqueue.bfd.fd > 0) { + /* No change needed, do nothing */ + if (!strcmp(dst_host, g_mfs.dst_host) && dst_port == g_mfs.dst_port) + return 0; + osmo_signal_unregister_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + meas_feed_close(); } - if (already_initialized) { - osmo_wqueue_clear(&g_mfs.wqueue); - osmo_fd_unregister(&g_mfs.wqueue.bfd); - close(g_mfs.wqueue.bfd.fd); - /* don't set to zero, as that would mean 'not yet initialized' */ - g_mfs.wqueue.bfd.fd = -1; - } + osmo_wqueue_init(&g_mfs.wqueue, 10); + g_mfs.wqueue.write_cb = feed_write_cb; + g_mfs.wqueue.read_cb = feed_read_cb; + osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); + LOGP(DMEAS, LOGL_DEBUG, "meas_feed: registered signal callback\n"); + rc = osmo_sock_init_ofd(&g_mfs.wqueue.bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, dst_host, dst_port, OSMO_SOCK_F_CONNECT); - if (rc < 0) + if (rc < 0) { + g_mfs.wqueue.bfd.fd = -1; return rc; + } osmo_fd_read_disable(&g_mfs.wqueue.bfd); - - if (g_mfs.dst_host) - talloc_free(g_mfs.dst_host); - g_mfs.dst_host = talloc_strdup(NULL, dst_host); + osmo_talloc_replace_string(NULL, &g_mfs.dst_host, dst_host); g_mfs.dst_port = dst_port; return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34243 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96b0b5c4654970ba1c3e2aecfa896e310063ab6f Gerrit-Change-Number: 34243 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-bsc[master]: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34244 ) Change subject: meas_feed: Increase wqueue max_len to 100 and make it vty-configurable ...................................................................... meas_feed: Increase wqueue max_len to 100 and make it vty-configurable The previous amount of 10 messages may be small if the BSC is processing lots of measurements from lots of BTS connected to it. Increase it to 100 by default, and allow changing the write_queue length through the VTY. Related: SYS#6550 Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 --- M include/osmocom/bsc/meas_feed.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/meas_feed.c 3 files changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/34244/1 diff --git a/include/osmocom/bsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h index 353278e..f2bd4ba 100644 --- a/include/osmocom/bsc/meas_feed.h +++ b/include/osmocom/bsc/meas_feed.h @@ -35,9 +35,12 @@ }; #define MEAS_FEED_VERSION 1 +#define MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT 100 int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port); void meas_feed_scenario_set(const char *name); +void meas_feed_wqueue_max_length_set(unsigned int max_length); void meas_feed_cfg_get(char **host, uint16_t *port); const char *meas_feed_scenario_get(void); +unsigned int meas_feed_wqueue_max_length_get(void); diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 7918d81..5c8debc 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -385,6 +385,7 @@ uint16_t meas_port; char *meas_host; const char *meas_scenario; + unsigned int max_len = meas_feed_wqueue_max_length_get(); meas_feed_cfg_get(&meas_host, &meas_port); meas_scenario = meas_feed_scenario_get(); @@ -395,6 +396,9 @@ if (strlen(meas_scenario) > 0) vty_out(vty, " meas-feed scenario %s%s", meas_scenario, VTY_NEWLINE); + if (max_len != MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT) + vty_out(vty, " meas-feed write-queue-max-length %u%s", + max_len, VTY_NEWLINE); } if (gsmnet->allow_unusable_timeslots) @@ -2416,6 +2420,16 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_net_meas_feed_wqueue_max_len, cfg_net_meas_feed_wqueue_max_len_cmd, + "meas-feed write-queue-max-length <0-65535>", + MEAS_FEED_STR "Set the maximum length of the message write queue towards the UDP socket\n" + "Maximum number of messages to be queued waiting for transmission\n", + CMD_ATTR_IMMEDIATE) +{ + meas_feed_wqueue_max_length_set(atoi(argv[0])); + return CMD_SUCCESS; +} + static void legacy_timers(struct vty *vty, const char **T_arg) { if (!strcmp((*T_arg), "T993111") || !strcmp((*T_arg), "t993111")) { @@ -3580,6 +3594,7 @@ install_element(GSMNET_NODE, &cfg_net_dyn_ts_allow_tch_f_cmd); install_element(GSMNET_NODE, &cfg_net_meas_feed_dest_cmd); install_element(GSMNET_NODE, &cfg_net_meas_feed_scenario_cmd); + install_element(GSMNET_NODE, &cfg_net_meas_feed_wqueue_max_len_cmd); install_element(GSMNET_NODE, &cfg_net_timer_cmd); install_element(GSMNET_NODE, &cfg_net_allow_unusable_timeslots_cmd); install_element(GSMNET_NODE, &cfg_net_pcu_sock_cmd); diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c index 41df4ea..4bf5a41 100644 --- a/src/osmo-bsc/meas_feed.c +++ b/src/osmo-bsc/meas_feed.c @@ -24,6 +24,7 @@ struct meas_feed_state { struct osmo_wqueue wqueue; + unsigned int wqueue_max_len; char scenario[31+1]; char *dst_host; uint16_t dst_port; @@ -31,6 +32,7 @@ static struct meas_feed_state g_mfs = { .wqueue.bfd.fd = -1, + .wqueue_max_len = MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT, }; static int process_meas_rep(struct gsm_meas_rep *mr) @@ -154,7 +156,7 @@ meas_feed_close(); } - osmo_wqueue_init(&g_mfs.wqueue, 10); + osmo_wqueue_init(&g_mfs.wqueue, g_mfs.wqueue_max_len); g_mfs.wqueue.write_cb = feed_write_cb; g_mfs.wqueue.read_cb = feed_read_cb; osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL); @@ -181,6 +183,18 @@ *host = g_mfs.dst_host; } +void meas_feed_wqueue_max_length_set(unsigned int max_length) +{ + g_mfs.wqueue_max_len = max_length; + if (g_mfs.wqueue.bfd.fd) + g_mfs.wqueue.max_length = max_length; +} + +unsigned int meas_feed_wqueue_max_length_get(void) +{ + return g_mfs.wqueue_max_len; +} + void meas_feed_scenario_set(const char *name) { osmo_strlcpy(g_mfs.scenario, name, sizeof(g_mfs.scenario)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34244 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib2e3591498c038b8e59f3ad447ac1f65928d6da8 Gerrit-Change-Number: 34244 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34058 ) Change subject: pcu_l1_if: add support for PCU_IF_SAPI_AGCH_2 for PCUIF v.11 ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34058/comment/7e235ade_d30b1afe PS3, Line 1143: /* During GMM ATTACH REQUEST, the IMSI is not yet known to the PCU or SGSN. (It is requested very long lines over > 120 characters -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9effdcec1da91a6e2e7a7c41f95d3300ad1bb292 Gerrit-Change-Number: 34058 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:28:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: contrib/libosmocore.spec: centos7: disable uring

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34241 ) Change subject: contrib/libosmocore.spec: centos7: disable uring ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2399754952d460499c9355706be37f792988bac Gerrit-Change-Number: 34241 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Aug 2023 14:01:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: write_queue: Introduce API osmo_wqueue_set_max_length()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34242 ) Change subject: write_queue: Introduce API osmo_wqueue_set_max_length() ...................................................................... write_queue: Introduce API osmo_wqueue_set_max_length() Change-Id: Ia1b138ed622f5efaa761bd9fa062b25b598f356f --- M TODO-RELEASE M include/osmocom/core/write_queue.h M src/core/libosmocore.map M src/core/write_queue.c 4 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/34242/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index f78104e..70664ff 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -17,4 +17,5 @@ libosmogsm MODIFY osmo_auth_impl callback function signature change. No known external users libosmogsm ADD osmo_auth_c2 libosmogsm ADD OSMO_AUTH_ALG_TUAK -libosmogsm ADD new API msgb_tv32_push() \ No newline at end of file +libosmogsm ADD new API msgb_tv32_push() +libosmocore ADD osmo_wqueue_set_max_length() \ No newline at end of file diff --git a/include/osmocom/core/write_queue.h b/include/osmocom/core/write_queue.h index 6cb0a6b..d66a3c9 100644 --- a/include/osmocom/core/write_queue.h +++ b/include/osmocom/core/write_queue.h @@ -48,6 +48,7 @@ void osmo_wqueue_init(struct osmo_wqueue *queue, int max_length); void osmo_wqueue_clear(struct osmo_wqueue *queue); +void osmo_wqueue_set_max_length(struct osmo_wqueue *queue, unsigned int max_length); int osmo_wqueue_enqueue(struct osmo_wqueue *queue, struct msgb *data); int osmo_wqueue_enqueue_quiet(struct osmo_wqueue *queue, struct msgb *data); int osmo_wqueue_bfd_cb(struct osmo_fd *fd, unsigned int what); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 99be86c..9630ded 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -565,6 +565,7 @@ osmo_wqueue_enqueue; osmo_wqueue_enqueue_quiet; osmo_wqueue_init; +osmo_wqueue_set_max_length; rate_ctr_add; rate_ctr_difference; rate_ctr_for_each_counter; diff --git a/src/core/write_queue.c b/src/core/write_queue.c index 884cebd..f8df124 100644 --- a/src/core/write_queue.c +++ b/src/core/write_queue.c @@ -99,6 +99,15 @@ INIT_LLIST_HEAD(&queue->msg_queue); } +/*! Set maximum length of write queue + * \param[in] queue Write queue to operate on + * \param[in] max_length Maximum length of write queue + */ +void osmo_wqueue_set_max_length(struct osmo_wqueue *queue, unsigned int max_length) +{ + queue->max_length = max_length; +} + /*! Enqueue a new \ref msgb into a write queue (without logging full queue events) * \param[in] queue Write queue to be used * \param[in] data to-be-enqueued message buffer -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia1b138ed622f5efaa761bd9fa062b25b598f356f Gerrit-Change-Number: 34242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: contrib/libosmocore.spec: centos7: disable uring

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34241 ) Change subject: contrib/libosmocore.spec: centos7: disable uring ...................................................................... contrib/libosmocore.spec: centos7: disable uring liburing is not available in CentOS 7, so disable it there. I've verified that this works as expected in our OBS with CentOS 7, 8 and openSUSE Tumbleweed. Related: OS#5751 Change-Id: Ie2399754952d460499c9355706be37f792988bac --- M contrib/libosmocore.spec.in 1 file changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/34241/1 diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 3fde143..ebd1938 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -32,7 +32,9 @@ BuildRequires: pkgconfig(talloc) >= 2.1.0 BuildRequires: pkgconfig(libmnl) BuildRequires: pkgconfig(libsystemd) +%if 0%{?centos_ver} != 7 BuildRequires: pkgconfig(liburing) +%endif %description libosmocore is a package with various utility functions that were @@ -339,8 +341,18 @@ %build echo "%version" >.tarball-version autoreconf -fiv -%configure --enable-shared --disable-static --enable-systemd-logging \ + +CONFIGURE_FLAGS=" + --enable-shared \ + --disable-static \ + --enable-systemd-logging \ --includedir="%_includedir/%name" +" +%if 0%{?centos_ver} == 7 + CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-uring" +%endif + +%configure $CONFIGURE_FLAGS make %{?_smp_mflags} V=1 %install -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie2399754952d460499c9355706be37f792988bac Gerrit-Change-Number: 34241 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master-builds: add simtrace

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34237 ) Change subject: jobs/master-builds: add simtrace ...................................................................... jobs/master-builds: add simtrace Replace the legacy SIMtrace job (not done with jenkins-job-builder) with a new master-simtrace job that works just like the other master jobs: - build in docker - have build commands in contrib/jenkins.sh Set the same notification mails as for simtrace2. Depends: https://gitea.osmocom.org/sim-card/simtrace/pulls/1 Change-Id: I0980ceafa4d1187630b75b45b01b538c750021bb --- M jobs/master-builds.yml 1 file changed, 22 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 6a2926c..2e54b63 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -173,7 +173,7 @@ # master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr, # master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu, # master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb - # master-osmocom-bb, SIMtrace, master-xgoldmon + # master-osmocom-bb, master-simtrace, master-xgoldmon # Optimized: # libosmocore # -> master-libosmo-abis @@ -211,7 +211,7 @@ master-osmo-tetra, master-osmo-trx, master-osmocom-bb, - SIMtrace, + master-simtrace, master-xgoldmon - libsmpp34: @@ -447,6 +447,9 @@ ssh: - binaries_ftp.osmocom.org - docs_ftp.osmocom.org + - simtrace: + git_base_url: https://gitea.osmocom.org/sim-card + email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de - simtrace2: cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish' email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34237 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0980ceafa4d1187630b75b45b01b538c750021bb Gerrit-Change-Number: 34237 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023