May 2022 - gerrit-log - lists.osmocom.org

Change in osmo-pcu[master]: gprs_pcu: Explicitly free all bts objects in list before freeing pcu

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28075 ) Change subject: gprs_pcu: Explicitly free all bts objects in list before freeing pcu ...................................................................... gprs_pcu: Explicitly free all bts objects in list before freeing pcu This is mostly important to unit tests, where the gprs_pcu object is recreated several times (it is not recreated in normal operation). The BTS objects are already being freed through talloc dependency tree. However, since they may trigger counter updates, access to the pcu list, etc, let's better do it explicitly before erasing gprs_pcu object fields. Related: OS#5555 Change-Id: If2a8360e214d993a8a89993532ff1099b30bdbb1 --- M src/gprs_pcu.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/75/28075/1 diff --git a/src/gprs_pcu.c b/src/gprs_pcu.c index e8dba06..ecb7f29 100644 --- a/src/gprs_pcu.c +++ b/src/gprs_pcu.c @@ -61,6 +61,10 @@ static int gprs_pcu_talloc_destructor(struct gprs_pcu *pcu) { + struct gprs_rlcmac_bts *bts; + while ((bts = llist_first_entry_or_null(&pcu->bts_list, struct gprs_rlcmac_bts, list))) + talloc_free(bts); + if (osmo_timer_pending(&pcu->update_stats_timer)) osmo_timer_del(&pcu->update_stats_timer); neigh_cache_free(pcu->neigh_cache); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If2a8360e214d993a8a89993532ff1099b30bdbb1 Gerrit-Change-Number: 28075 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-pcu[master]: bts: Call gprs_bssgp_destroy() in destructor

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28076 ) Change subject: bts: Call gprs_bssgp_destroy() in destructor ...................................................................... bts: Call gprs_bssgp_destroy() in destructor Change-Id: I7ed7f489f36f88277e2d5e393edcb339bf0cbba0 --- M src/bts.cpp M tests/tbf/TbfTest.cpp 2 files changed, 9 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/76/28076/1 diff --git a/src/bts.cpp b/src/bts.cpp index 5c870af..e955687 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -245,6 +245,8 @@ bts->ms_store->cleanup(); delete bts->ms_store; + gprs_bssgp_destroy(bts); + osmo_time_cc_cleanup(&bts->all_allocated_pdch); if (bts->ratectrs) { diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 4651269..585496a 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -528,7 +528,6 @@ OSMO_ASSERT(rc == -EBUSY); fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(bts); TALLOC_FREE(the_pcu); } @@ -623,7 +622,6 @@ fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(bts); TALLOC_FREE(the_pcu); } @@ -2271,14 +2269,12 @@ OSMO_ASSERT(rc == 0); fprintf(stderr, "=== end %s ===\n", __func__); - gprs_bssgp_destroy(bts); TALLOC_FREE(the_pcu); } static inline void ws_check(gprs_rlcmac_dl_tbf *dl_tbf, const char *test, uint8_t exp_slots, uint16_t exp_ws, - bool free, bool end) + bool free) { - gprs_rlcmac_bts *bts = dl_tbf->bts; if (!dl_tbf) { fprintf(stderr, "%s(): FAILED (NULL TBF)\n", test); return; @@ -2297,11 +2293,6 @@ if (free) tbf_free(dl_tbf); - - if (end) { - fprintf(stderr, "=== end %s ===\n", test); - gprs_bssgp_destroy(bts); - } } static void test_tbf_ws() @@ -2337,7 +2328,7 @@ ms = bts_alloc_ms(bts, ms_class, 0); dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, false); - ws_check(dl_tbf, __func__, 4, 64, true, false); + ws_check(dl_tbf, __func__, 4, 64, true); /* EGPRS-only */ @@ -2345,7 +2336,8 @@ ms = bts_alloc_ms(bts, ms_class, ms_class); dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, false); - ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true, true); + ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true); + fprintf(stderr, "=== end %s ===\n", __func__); TALLOC_FREE(the_pcu); } @@ -2384,12 +2376,13 @@ ms = bts_alloc_ms(bts, ms_class, ms_class); dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, true); - ws_check(dl_tbf, __func__, 1, 128 + 1 * 64, false, false); + ws_check(dl_tbf, __func__, 1, 128 + 1 * 64, false); dl_tbf->update(); /* window size should be 384 */ - ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true, true); + ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true); + fprintf(stderr, "=== end %s ===\n", __func__); TALLOC_FREE(the_pcu); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7ed7f489f36f88277e2d5e393edcb339bf0cbba0 Gerrit-Change-Number: 28076 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-pcu[master]: gprs_ms: Use osmo_timer_setup() API

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28072 ) Change subject: gprs_ms: Use osmo_timer_setup() API ...................................................................... gprs_ms: Use osmo_timer_setup() API Change-Id: I261f4dcee15942bdce82c6b8a8a558a38bedd6fe --- M src/gprs_ms.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/72/28072/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 6dc11a6..6daab31 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -111,8 +111,7 @@ LOGP(DRLCMAC, LOGL_INFO, "Creating MS object, TLLI = 0x%08x\n", tlli); ms->imsi[0] = '\0'; - memset(&ms->timer, 0, sizeof(ms->timer)); - ms->timer.cb = ms_release_timer_cb; + osmo_timer_setup(&ms->timer, ms_release_timer_cb, NULL); llc_queue_init(&ms->llc_queue, ms); ms_set_mode(ms, GPRS); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28072 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I261f4dcee15942bdce82c6b8a8a558a38bedd6fe Gerrit-Change-Number: 28072 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-pcu[master]: gprs_ms_storage: Use bts_stat_item_inc/dec APIs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28073 ) Change subject: gprs_ms_storage: Use bts_stat_item_inc/dec APIs ...................................................................... gprs_ms_storage: Use bts_stat_item_inc/dec APIs Change-Id: I2957513c35a1a075440d82b0f7f2c767c69ea9cc --- M src/gprs_ms_storage.cpp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/73/28073/1 diff --git a/src/gprs_ms_storage.cpp b/src/gprs_ms_storage.cpp index b98104d..f980824 100644 --- a/src/gprs_ms_storage.cpp +++ b/src/gprs_ms_storage.cpp @@ -28,7 +28,7 @@ static void ms_storage_ms_idle_cb(struct GprsMs *ms) { llist_del(&ms->list); - bts_stat_item_add(ms->bts, STAT_MS_PRESENT, -1); + bts_stat_item_dec(ms->bts, STAT_MS_PRESENT); if (ms_is_idle(ms)) talloc_free(ms); } @@ -102,7 +102,7 @@ ms_set_callback(ms, &ms_storage_ms_cb); llist_add(&ms->list, &m_list); if (m_bts) - bts_stat_item_add(m_bts, STAT_MS_PRESENT, 1); + bts_stat_item_inc(m_bts, STAT_MS_PRESENT); return ms; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28073 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2957513c35a1a075440d82b0f7f2c767c69ea9cc Gerrit-Change-Number: 28073 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmo-abis[master]: input/ipaccess: Remove unneeded osmo_fd_write_enable()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28070 ) Change subject: input/ipaccess: Remove unneeded osmo_fd_write_enable() ...................................................................... input/ipaccess: Remove unneeded osmo_fd_write_enable() Recent commit optimize the same function by avoiding an extra poll loop when e1i_ts->sign.delay was zero. Upon doing so, the osmo_fd_write_disable() was moved to some conditional paths. Hence, the WRITE flag is left set and we don't need to set it again in the code path modified in this commit. Fixes: 28fea7746bbc2fb8ca0f677a93559c0c9f4cff09 Change-Id: I84787b6de2a5ccc82bd8f19ce874e73708bc287f --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/70/28070/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index b995fde..ca48d21 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -509,7 +509,7 @@ case E1INP_SIGN_OSMO: break; default: - osmo_fd_write_enable(bfd); /* come back for more msg */ + /* leave WRITE flag enabled, come back for more msg */ ret = -EINVAL; goto out; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I84787b6de2a5ccc82bd8f19ce874e73708bc287f Gerrit-Change-Number: 28070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in libosmo-abis[master]: input/ipaccess: Avoid extra poll() call when e1i_ts tx queue becomes ...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/28071 ) Change subject: input/ipaccess: Avoid extra poll() call when e1i_ts tx queue becomes empty ...................................................................... input/ipaccess: Avoid extra poll() call when e1i_ts tx queue becomes empty Before this patch, the logic (both for delayed tx and immediate tx) always left the WRITE flag set, and relied on an extra call back from the main loop (poll()) to disable the flag until it found out there was nothing else to send. Instead, let's disable it immediatelly at the time we submit the last message in the queue. Change-Id: I0e5da5d1342f352d0e2bca9ee39c768bccb2c8d5 --- M src/input/ipaccess.c 1 file changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/71/28071/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index ca48d21..07fd814 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -477,12 +477,24 @@ } } +static bool e1i_ts_has_pending_tx_msgs(struct e1inp_ts *e1i_ts) +{ + struct e1inp_sign_link *link; + llist_for_each_entry(link, &e1i_ts->sign.sign_links, list) { + if (!llist_empty(&link->tx_list)) { + return true; + } + } + return false; +} + static void timeout_ts1_write(void *data) { struct e1inp_ts *e1i_ts = (struct e1inp_ts *)data; /* trigger write of ts1, due to tx delay timer */ - ts_want_write(e1i_ts); + if (e1i_ts_has_pending_tx_msgs(e1i_ts)) + ts_want_write(e1i_ts); } static int __handle_ts1_write(struct osmo_fd *bfd, struct e1inp_line *line) @@ -535,9 +547,11 @@ /* set tx delay timer for next event */ osmo_timer_setup(&e1i_ts->sign.tx_timer, timeout_ts1_write, e1i_ts); osmo_timer_schedule(&e1i_ts->sign.tx_timer, 0, e1i_ts->sign.delay); - } - + } else { out: + if (!e1i_ts_has_pending_tx_msgs(e1i_ts)) + osmo_fd_write_disable(bfd); + } msgb_free(msg); return ret; err: -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/28071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0e5da5d1342f352d0e2bca9ee39c768bccb2c8d5 Gerrit-Change-Number: 28071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: fix fallout from: 'stats: new trackers for lchan life duration'

by iedemam

iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28061 ) Change subject: fix fallout from: 'stats: new trackers for lchan life duration' ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > it's usually the test suite that catches obscurely appearing bugs. […] Thanks for adding me to the reviewers group, I appreciate the trust. I will try to get a local TTCN3 test runner going this week. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I901bb86a78d7d021c8efe751fd9d93e5956ac0e0 Gerrit-Change-Number: 28061 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 09 May 2022 07:36:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: iedemam <michael(a)kapsulate.com> Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Build failure of network:osmocom:nightly/osmo-remsim in Debian_Testing/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: Reading from filehandle failed at ./bs_worker line 1379. (worker was cloud118:2) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 1 month

1
0
0 0

Build failure of network:osmocom:nightly/osmo-hnbgw in Debian_Testing/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-hnbgw failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hnbgw Last lines of build log: Reading from filehandle failed at ./bs_worker line 1379. (worker was cloud118:1) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 1 month

1
0
0 0

Build failure of network:osmocom:latest/osmocom-latest in Debian_Testing/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/os… Package network:osmocom:latest/osmocom-latest failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmocom-latest Last lines of build log: /var/cache/obs/worker/root_4/.pkgs/libgomp1.deb: Input/output error (worker was cloud118:4) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022