February 2026 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: bts: rename g_next_meas_res_nr / g_first_meas_res
by fixeria 02 Feb '26

02 Feb '26

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41935?usp=email ) Change subject: bts: rename g_next_meas_res_nr / g_first_meas_res ...................................................................... Patch Set 3: (1 comment) This change is ready for review. Patchset: PS2: > Yes sure, but the main reason to have the Pars substruct is to be able to pass config at startup to […] Acknowledged -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41935?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iceb58bb636817afcd0fdf1eb3344d03153860a56 Gerrit-Change-Number: 41935 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Feb 2026 13:57:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: as_rsl_meas_res(): move chan_est to ConnHdlr
by fixeria 02 Feb '26

02 Feb '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42011?usp=email ) Change subject: bts: as_rsl_meas_res(): move chan_est to ConnHdlr ...................................................................... bts: as_rsl_meas_res(): move chan_est to ConnHdlr Altstep local variables are reset when another altstep, executed among with as_rsl_meas_res(), repeats. Move the chan_est variable to ConnHdlr, so that it does not get reset. Change-Id: I3a31532494e123935fb2aede0e67e4271962ab5f Related: OS#6933 --- M bts/BTS_Tests.ttcn 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/42011/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 940b409..836b033 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -222,6 +222,7 @@ /* RSL MEASurement RESult params for as_rsl_meas_res() */ var uint8_t g_rsl_meas_res_nr := 0; var boolean g_rsl_meas_res_first := true; + var boolean g_rsl_meas_res_chan_est := false; /* PCU Interface of BTS */ port PCUIF_CODEC_PT PCU; @@ -2380,7 +2381,6 @@ /* verify we regularly receive measurement reports on RSL with incrementing numbers */ private altstep as_rsl_meas_res(boolean verify_meas := true) runs on ConnHdlr { var RSL_Message rsl; - var boolean chan_est := false; [not verify_meas] RSL.receive(tr_RSL_MEAS_RES(?)) { repeat; } @@ -2398,7 +2398,7 @@ * the "our" measurement report the first time, the channel * is established and empty or hardcoded TRXCON reports must * not occur anymore. */ - chan_est := true; + g_rsl_meas_res_chan_est := true; repeat; } @@ -2407,7 +2407,7 @@ * more time to establish the channel and actually start sending. The * result is then a measurement report that just lacks the measurement * information of the MS. This is normal and we tolerate this behavior. */ - [chan_est == false] RSL.receive(f_build_meas_res_tmpl_empty()) -> value rsl { + [not g_rsl_meas_res_chan_est] RSL.receive(f_build_meas_res_tmpl_empty()) -> value rsl { /* increment counter of next to-be-expected meas rep */ g_rsl_meas_res_nr := (g_rsl_meas_res_nr + 1) mod 256; /* Re-start the timer expecting the next MEAS RES */ @@ -2421,7 +2421,7 @@ * report or a hardcoded one. If TRXCON picks the hardcoded measurement * report the templates above will not match. We tolerate this * behavior, but only once. */ - [chan_est == false] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, g_rsl_meas_res_nr)) -> value rsl { + [not g_rsl_meas_res_chan_est] RSL.receive(tr_RSL_MEAS_RES(g_chan_nr, g_rsl_meas_res_nr)) -> value rsl { /* increment counter of next to-be-expected meas rep */ g_rsl_meas_res_nr := (g_rsl_meas_res_nr + 1) mod 256; if (g_rsl_meas_res_first) { @@ -2582,6 +2582,7 @@ } g_rsl_meas_res_first := true; + g_rsl_meas_res_chan_est := false; } private function get_start_amr_ft() runs on ConnHdlr return integer { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42011?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a31532494e123935fb2aede0e67e4271962ab5f Gerrit-Change-Number: 42011 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: f_est_dchan(): also reset g_rsl_meas_res_nr
by fixeria 02 Feb '26

02 Feb '26

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42012?usp=email ) Change subject: bts: f_est_dchan(): also reset g_rsl_meas_res_nr ...................................................................... bts: f_est_dchan(): also reset g_rsl_meas_res_nr This avoids unexpected failures if a dedicated channel is established more than once by ConnHdlr. Change-Id: Ia26413339c8c056e21661ae29bb2618b4a05ec70 Related: OS#6933 --- M bts/BTS_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/12/42012/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 836b033..32061e5 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2581,6 +2581,7 @@ amr_codecs_bitmask := amr_codecs_bitmask)); } + g_rsl_meas_res_nr := 0; g_rsl_meas_res_first := true; g_rsl_meas_res_chan_est := false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42012?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia26413339c8c056e21661ae29bb2618b4a05ec70 Gerrit-Change-Number: 42012 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: bts: f_build_meas_res_tmpl(): expect specific L3 INFO
by fixeria 02 Feb '26

02 Feb '26

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41937?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: bts: f_build_meas_res_tmpl(): expect specific L3 INFO ...................................................................... bts: f_build_meas_res_tmpl(): expect specific L3 INFO Change-Id: I1892d3ae3f72443ded6321487e9b191cd1948aac Related: OS#6933 --- M bts/BTS_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/41937/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41937?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1892d3ae3f72443ded6321487e9b191cd1948aac Gerrit-Change-Number: 41937 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: Use same queue length for gsmtap_log and gsmtap_file
by pespin 02 Feb '26

02 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41980?usp=email ) Change subject: Use same queue length for gsmtap_log and gsmtap_file ...................................................................... Use same queue length for gsmtap_log and gsmtap_file Take the chance to also deduplicate MAX_LOG_SIZE. Change-Id: I3772d291f97626ee325731f3515a5110eda70d3d --- M include/osmocom/core/logging_internal.h M src/core/logging_file.c M src/core/logging_gsmtap.c 3 files changed, 8 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index 0cc82a4..e898758 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -11,6 +11,9 @@ /* maximum length of the log string of a single log event (typically line) */ #define MAX_LOG_SIZE 4096 +/* maximum number of log statements we queue in file/stderr target write queue */ +#define LOG_WQUEUE_LEN 156 + struct log_thread_state { /* Whether we are inside a code path to generate logging output: */ bool logging_active; diff --git a/src/core/logging_file.c b/src/core/logging_file.c index aa5ef63..9c7cf36 100644 --- a/src/core/logging_file.c +++ b/src/core/logging_file.c @@ -41,9 +41,6 @@ #include <osmocom/core/osmo_io.h> #include <osmocom/core/logging_internal.h> -/* maximum number of log statements we queue in file/stderr target write queue */ -#define LOG_WQUEUE_LEN 156 - /* NOTE: We use target->tgt_file.wqueue->except_cb to store the struct osmo_io_fd, because the * struct log_target is public and we cannot add pointers to it under tgt->tgt_file... * It can be moved to target->tgt_file.iofd if we are ever able to make struct log_target private... */ diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index 062efd9..38e305b 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -44,15 +44,14 @@ #include <osmocom/core/utils.h> #include <osmocom/core/gsmtap.h> #include <osmocom/core/gsmtap_util.h> -#include <osmocom/core/logging.h> +#include <osmocom/core/logging_internal.h> #include <osmocom/core/timer.h> #include <osmocom/core/byteswap.h> #include <osmocom/core/thread.h> -#define GSMTAP_LOG_MAX_SIZE 4096 #define GSMTAP_MSG_MAX_SIZE (sizeof(struct gsmtap_hdr) + \ sizeof(struct gsmtap_osmocore_log_hdr) + \ - GSMTAP_LOG_MAX_SIZE) + MAX_LOG_SIZE) static __thread uint32_t logging_gsmtap_tid; @@ -156,10 +155,10 @@ #ifndef ENABLE_PSEUDOTALLOC size_t num_pool_objects; if (ofd_wq_mode) { - /* Allocate a talloc pool to avoid malloc() on the first 100 - * concurrently queued msgbs (~400KB per gsmtap_log target). + /* Allocate a talloc pool to avoid malloc() on the first 156 + * concurrently queued msgbs (~624KB per gsmtap_log target). * Once the talloc_pool is full, new normal talloc chunks will be used. */ - num_pool_objects = 100; + num_pool_objects = LOG_WQUEUE_LEN; } else { /* When in synchronous mode (blocking & non-blocking), there's * no queueing in gsmtap_sendmsg() so there's no need to have a -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41980?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3772d291f97626ee325731f3515a5110eda70d3d Gerrit-Change-Number: 41980 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(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>

1 0

[XS] Change in libosmocore[master]: osmo_io: Remove outdated comment in API doc of osmo_iofd_set_io_buffe...
by pespin 02 Feb '26

02 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41988?usp=email ) Change subject: osmo_io: Remove outdated comment in API doc of osmo_iofd_set_io_buffers() ...................................................................... osmo_io: Remove outdated comment in API doc of osmo_iofd_set_io_buffers() Multiple iov buffers are supported in poll backend since 4272cd46b1e5b264e6f6b65d38bcb08e3a139a9e. Related: OS#6705 Change-Id: I9b75f3597081c6cd7e24f75f0e289b93edb3aa86 --- M src/core/osmo_io.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 3cd9dc5..7c931d3 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -910,7 +910,6 @@ * * If the osmo_io_fd is in OSMO_IO_FD_MODE_READ_WRITE mode, this API function can be used to tell the * osmo_io proecess how many buffers should be read or written with a single read or write operation. - * This feature is supported with io_uring backend only. * * \param[in] iofd the iofd file descriptor * \param[in] op the osmo_io_op (read or write) to set the number of IO buffers for -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41988?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9b75f3597081c6cd7e24f75f0e289b93edb3aa86 Gerrit-Change-Number: 41988 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmocore[master]: Implement log file target using osmo_io
by pespin 02 Feb '26

02 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41925?usp=email ) Change subject: Implement log file target using osmo_io ...................................................................... Implement log file target using osmo_io Reuse (struct log_target)->tgt_file->wqueue->except_cb to store the iofd pointer internally, since we are not allowed to change the struct log_target because it's public and we don't want to break the ABI. Using the wqueue except_cb is fine since that field was never used. Related: OS#6918 Change-Id: Ieb6420246454ef59442b1fd7b1d14e2c00fa69a5 --- M src/core/logging_file.c M tests/logging/logging_test.c M tests/logging/logging_test.err 3 files changed, 143 insertions(+), 132 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/core/logging_file.c b/src/core/logging_file.c index 413a0a7..aa5ef63 100644 --- a/src/core/logging_file.c +++ b/src/core/logging_file.c @@ -38,18 +38,22 @@ #include <osmocom/core/utils.h> #include <osmocom/core/select.h> #include <osmocom/core/write_queue.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/core/logging_internal.h> /* maximum number of log statements we queue in file/stderr target write queue */ #define LOG_WQUEUE_LEN 156 +/* NOTE: We use target->tgt_file.wqueue->except_cb to store the struct osmo_io_fd, because the + * struct log_target is public and we cannot add pointers to it under tgt->tgt_file... + * It can be moved to target->tgt_file.iofd if we are ever able to make struct log_target private... */ /*! close and re-open a log file (for log file rotation) * \param[in] target log target to re-open * \returns 0 in case of success; negative otherwise */ int log_target_file_reopen(struct log_target *target) { - struct osmo_wqueue *wq; + struct osmo_io_fd *iofd; int rc; OSMO_ASSERT(target->type == LOG_TGT_TYPE_FILE || @@ -67,20 +71,22 @@ } OSMO_ASSERT(target->tgt_file.wqueue); - wq = target->tgt_file.wqueue; - if (wq->bfd.fd >= 0) { - osmo_fd_unregister(&wq->bfd); - close(wq->bfd.fd); - wq->bfd.fd = -1; - } + iofd = (struct osmo_io_fd *)target->tgt_file.wqueue->except_cb; + OSMO_ASSERT(iofd); + osmo_iofd_close(iofd); + target->tgt_file.wqueue->bfd.fd = -1; /* Keep public field changes despite not used internally... */ rc = open(target->tgt_file.fname, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK, 0660); if (rc < 0) return -errno; - wq->bfd.fd = rc; - rc = osmo_fd_register(&wq->bfd); - if (rc < 0) - return rc; + + rc = osmo_iofd_register(iofd, rc); + if (rc < 0) { + osmo_iofd_free(iofd); + target->tgt_file.wqueue->except_cb = NULL; /* target->tgt_file.iofd = NULL */ + return -EIO; + } + target->tgt_file.wqueue->bfd.fd = rc; /* Keep public field changes despite not used internally... */ return 0; } @@ -91,7 +97,6 @@ * object. */ void log_target_file_destroy(struct log_target *target) { - struct osmo_wqueue *wq; OSMO_ASSERT(target->type == LOG_TGT_TYPE_FILE || target->type == LOG_TGT_TYPE_STDERR); @@ -101,38 +106,21 @@ fclose(target->tgt_file.out); target->tgt_file.out = NULL; } - wq = target->tgt_file.wqueue; - if (wq) { - if (wq->bfd.fd >= 0) { - osmo_fd_unregister(&wq->bfd); - if (target->type == LOG_TGT_TYPE_FILE) - close(wq->bfd.fd); - wq->bfd.fd = -1; - } - osmo_wqueue_clear(wq); - talloc_free(wq); - target->tgt_file.wqueue = NULL; + + if (target->tgt_file.wqueue && target->tgt_file.wqueue->except_cb) { /* target->tgt_file.iofd */ + osmo_iofd_free((struct osmo_io_fd *)target->tgt_file.wqueue->except_cb); + target->tgt_file.wqueue->except_cb = NULL; /* target->tgt_file.iofd = NULL */ + target->tgt_file.wqueue->bfd.fd = -1; /* Keep public field changes despite not used internally... */ } + talloc_free((void *)target->tgt_file.fname); target->tgt_file.fname = NULL; } -/* write-queue tells us we should write another msgb (log line) to the output fd */ -static int _file_wq_write_cb(struct osmo_fd *ofd, struct msgb *msg) -{ - int rc; - - rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); - if (rc < 0) - return rc; - if (rc != msgb_length(msg)) { - /* pull the number of bytes we have already written */ - msgb_pull(msg, rc); - /* ask write_queue to re-insert the msgb at the head of the queue */ - return -EAGAIN; - } - return 0; -} +static struct osmo_io_ops log_target_file_io_ops = { + .read_cb = NULL, + .write_cb = NULL, +}; /* output via buffered, blocking stdio streams */ static void _file_output_stream(struct log_target *target, unsigned int level, @@ -147,37 +135,53 @@ static void _file_raw_output(struct log_target *target, int subsys, unsigned int level, const char *file, int line, int cont, const char *format, va_list ap) { + OSMO_ASSERT(target->tgt_file.wqueue && target->tgt_file.wqueue->except_cb); struct msgb *msg; + struct osmo_io_fd *iofd = (struct osmo_io_fd *)target->tgt_file.wqueue->except_cb; + void *pool_ctx = osmo_iofd_get_data(iofd); int rc; - OSMO_ASSERT(target->tgt_file.wqueue); - msg = msgb_alloc_c(target->tgt_file.wqueue, MAX_LOG_SIZE, "log_file_msg"); + msg = msgb_alloc_c(pool_ctx, MAX_LOG_SIZE, "log_file_msg"); if (!msg) return; /* we simply enqueue the log message to a write queue here, to avoid any blocking * writes on the output file. The write queue will tell us once the file is writable * and call _file_wq_write_cb() */ - rc = log_output_buf((char *)msgb_data(msg), msgb_tailroom(msg), target, subsys, level, file, line, cont, format, ap); + rc = log_output_buf((char *)msgb_data(msg), msgb_tailroom(msg), target, subsys, level, + file, line, cont, format, ap); msgb_put(msg, rc); - /* attempt a synchronous, non-blocking write, if the write queue is empty */ - if (target->tgt_file.wqueue->current_length == 0) { - rc = _file_wq_write_cb(&target->tgt_file.wqueue->bfd, msg); - if (rc == 0) { - /* the write was complete, we can exit early */ - msgb_free(msg); - return; - } - } - /* if we reach here, either we already had elements in the write_queue, or the synchronous write - * failed: enqueue the message to the write_queue (backlog) */ - if (osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg) < 0) { + rc = osmo_iofd_write_msgb(iofd, msg); + if (rc < 0) { msgb_free(msg); /* TODO: increment some counter so we can see that messages were dropped */ } } +void _log_target_file_setup_talloc_pool(struct log_target *target) +{ + OSMO_ASSERT(target->tgt_file.wqueue && target->tgt_file.wqueue->except_cb); + struct osmo_io_fd *iofd = (struct osmo_io_fd *)target->tgt_file.wqueue->except_cb; + if (osmo_iofd_get_data(iofd)) + return; /* mempool already allocated */ + +#ifndef ENABLE_PSEUDOTALLOC + void *pool_ctx; + /* Allocate a talloc pool to avoid malloc() on the first 156 + * concurrently queued msgbs (~640KB per gsmtap_log target). + * Once the talloc_pool is full, new normal talloc chunks will be used. */ + pool_ctx = _talloc_pooled_object(target, 0, "file_log_msgb_pool", + LOG_WQUEUE_LEN, + (sizeof(struct msgb) + MAX_LOG_SIZE) * LOG_WQUEUE_LEN); + osmo_iofd_set_data(iofd, pool_ctx); +#else + /* talloc pools not supported by pseudotalloc, allocate on usual msgb ctx instead: */ + extern void *tall_msgb_ctx; + osmo_iofd_set_data(iofd, tall_msgb_ctx); +#endif /* ifndef ENABLE_PSEUDOTALLOC */ +} + /*! switch from non-blocking/write-queue to blocking + buffered stream output * \param[in] target log target which we should switch * \return 0 on success; 1 if already switched before; negative on error @@ -185,7 +189,8 @@ */ int log_target_file_switch_to_stream(struct log_target *target) { - struct osmo_wqueue *wq; + struct osmo_io_fd *iofd; + unsigned int prev_queue_len; if (!target) return -ENODEV; @@ -195,36 +200,70 @@ return 1; } - wq = target->tgt_file.wqueue; - OSMO_ASSERT(wq); - /* re-open output as stream */ if (target->type == LOG_TGT_TYPE_STDERR) target->tgt_file.out = stderr; else target->tgt_file.out = fopen(target->tgt_file.fname, "a"); + if (!target->tgt_file.out) return -EIO; - /* synchronously write anything left in the queue */ - while (!llist_empty(&wq->msg_queue)) { - struct msgb *msg = msgb_dequeue(&wq->msg_queue); - fwrite(msgb_data(msg), msgb_length(msg), 1, target->tgt_file.out); - msgb_free(msg); - } + iofd = (struct osmo_io_fd *)target->tgt_file.wqueue->except_cb; + prev_queue_len = osmo_iofd_txqueue_len(iofd); - /* now that everything succeeded, we can finally close the old output fd */ - osmo_fd_unregister(&wq->bfd); - if (target->type == LOG_TGT_TYPE_FILE) - close(wq->bfd.fd); - wq->bfd.fd = -1; - + /* now that everything succeeded, we can finally close the old iofd */ + osmo_iofd_free(iofd); + target->tgt_file.wqueue->except_cb = NULL; /* target->tgt_file.iofd = NULL */ + target->tgt_file.wqueue->bfd.fd = -1; /* Keep public field changes despite not used internally... */ /* release the queue itself */ - talloc_free(wq); + talloc_free(target->tgt_file.wqueue); target->tgt_file.wqueue = NULL; target->output = _file_output_stream; target->raw_output = NULL; + + if (prev_queue_len > 0) + LOGP(DLGLOBAL, LOGL_NOTICE, + "Dropped %u messages switching log target file to stream\n", prev_queue_len); + + return 0; +} + +/* Owns fd on success, closes fd on error. */ +int _log_target_file_setup_iofd(struct log_target *target, int fd) +{ + struct osmo_io_fd *iofd; + int rc; + + /* XXX: This wq is only created to keep public log_target fields + * similar. It's not really used anymore internally, other than holding a + * struct osmo_io_fd in wq->except_cb...*/ + target->tgt_file.wqueue = talloc_zero(target, struct osmo_wqueue); + OSMO_ASSERT(target->tgt_file.wqueue); + osmo_wqueue_init(target->tgt_file.wqueue, LOG_WQUEUE_LEN); + + iofd = osmo_iofd_setup(target, fd, target->tgt_file.fname, + OSMO_IO_FD_MODE_READ_WRITE, + &log_target_file_io_ops, NULL); + if (!iofd) { + close(fd); + return -EIO; + } + target->tgt_file.wqueue->except_cb = (int (*)(struct osmo_fd *))iofd; + target->tgt_file.wqueue->bfd.fd = fd; /* Keep public field changes despite not used internally... */ + + _log_target_file_setup_talloc_pool(target); + osmo_iofd_set_txqueue_max_length(iofd, OSMO_MAX(osmo_iofd_get_txqueue_max_length(iofd), LOG_WQUEUE_LEN)); + + rc = osmo_iofd_register(iofd, -1); + if (rc < 0) { + osmo_iofd_free(iofd); + target->tgt_file.wqueue->except_cb = NULL; + target->tgt_file.wqueue->bfd.fd = -1; /* Keep public field changes despite not used internally... */ + talloc_free(target->tgt_file.wqueue); + return -EIO; + } return 0; } @@ -235,8 +274,7 @@ */ int log_target_file_switch_to_wqueue(struct log_target *target) { - struct osmo_wqueue *wq; - int rc; + int rc, fd; if (!target) return -ENODEV; @@ -246,35 +284,19 @@ return 1; } - /* we create a ~640kB sized talloc pool within the write-queue to ensure individual - * log lines (stored as msgbs) will not put result in malloc() calls, and also to - * reduce the OOM probability within logging, as the pool is already allocated */ - wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, - LOG_WQUEUE_LEN*(sizeof(struct msgb)+MAX_LOG_SIZE)); - if (!wq) - return -ENOMEM; - osmo_wqueue_init(wq, LOG_WQUEUE_LEN); - fflush(target->tgt_file.out); - if (target->type == LOG_TGT_TYPE_FILE) { - rc = open(target->tgt_file.fname, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK, 0660); - if (rc < 0) { - talloc_free(wq); - return -errno; - } - } else { - rc = STDERR_FILENO; - } - wq->bfd.fd = rc; - wq->bfd.when = OSMO_FD_WRITE; - wq->write_cb = _file_wq_write_cb; + if (target->type == LOG_TGT_TYPE_FILE) + fd = open(target->tgt_file.fname, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK, 0660); + else /* LOG_TGT_TYPE_STDERR: dup file so we can close it later with osmo_iofd_free() */ + fd = dup(STDERR_FILENO); - rc = osmo_fd_register(&wq->bfd); - if (rc < 0) { - talloc_free(wq); - return -EIO; - } - target->tgt_file.wqueue = wq; + if (fd < 0) + return -errno; + + rc = _log_target_file_setup_iofd(target, fd); + if (rc < 0) + return rc; + target->raw_output = _file_raw_output; target->output = NULL; @@ -293,45 +315,30 @@ struct log_target *log_target_create_file(const char *fname) { struct log_target *target; - struct osmo_wqueue *wq; - int rc; + int rc, fd; target = log_target_create(); if (!target) return NULL; target->type = LOG_TGT_TYPE_FILE; - /* we create a ~640kB sized talloc pool within the write-queue to ensure individual - * log lines (stored as msgbs) will not put result in malloc() calls, and also to - * reduce the OOM probability within logging, as the pool is already allocated */ - wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, - LOG_WQUEUE_LEN*(sizeof(struct msgb)+MAX_LOG_SIZE)); - if (!wq) { - log_target_destroy(target); - return NULL; - } - osmo_wqueue_init(wq, LOG_WQUEUE_LEN); - wq->bfd.fd = open(fname, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK, 0660); - if (wq->bfd.fd < 0) { - talloc_free(wq); - log_target_destroy(target); - return NULL; - } - wq->bfd.when = OSMO_FD_WRITE; - wq->write_cb = _file_wq_write_cb; - - rc = osmo_fd_register(&wq->bfd); - if (rc < 0) { - talloc_free(wq); - log_target_destroy(target); - return NULL; - } - - target->tgt_file.wqueue = wq; - target->raw_output = _file_raw_output; target->tgt_file.fname = talloc_strdup(target, fname); + OSMO_ASSERT(target->tgt_file.fname); + target->raw_output = _file_raw_output; + + fd = open(fname, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK, 0660); + if (fd < 0) + goto free_ret; + + rc = _log_target_file_setup_iofd(target, fd); + if (rc < 0) + goto free_ret; return target; + +free_ret: + log_target_destroy(target); + return NULL; } #endif diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index 3548b1d..27ad550 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -16,6 +16,7 @@ */ #include <osmocom/core/logging.h> +#include <osmocom/core/select.h> #include <osmocom/core/utils.h> #include <stdlib.h> @@ -138,5 +139,8 @@ log_set_print_filename_pos(stderr_target, LOG_FILENAME_POS_LINE_END); DEBUGP(DLGLOBAL, "A message with source info printed last\n"); + for (int i = 0; i < 20; i++) + osmo_select_main(1); + return 0; } diff --git a/tests/logging/logging_test.err b/tests/logging/logging_test.err index 01ab878..fb5181c 100644 --- a/tests/logging/logging_test.err +++ b/tests/logging/logging_test.err @@ -7,5 +7,5 @@ DLGLOBAL You should see this on DLGLOBAL (d) DLGLOBAL You should see this on DLGLOBAL (e) DLGLOBAL You should see this (DLGLOBAL on DEBUG) -DLGLOBAL logging_test.c:137 A message with source info printed first -DLGLOBAL A message with source info printed last (logging_test.c:139) +DLGLOBAL logging_test.c:138 A message with source info printed first +DLGLOBAL A message with source info printed last (logging_test.c:140) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41925?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieb6420246454ef59442b1fd7b1d14e2c00fa69a5 Gerrit-Change-Number: 41925 Gerrit-PatchSet: 17 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: osmo_io: Allow fetching maximum value allowed by osmo_iofd_set_io_buf...
by pespin 02 Feb '26

02 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41989?usp=email ) Change subject: osmo_io: Allow fetching maximum value allowed by osmo_iofd_set_io_buffers() ...................................................................... osmo_io: Allow fetching maximum value allowed by osmo_iofd_set_io_buffers() Before this patch, there's no way for a user of the API to know whether a requested buffers value is actually going to be accepted or not. Change-Id: Id3d8413c119eb3d9b60aa068295a59561236938c --- M src/core/osmo_io.c 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 7c931d3..8ee6967 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -915,15 +915,23 @@ * \param[in] op the osmo_io_op (read or write) to set the number of IO buffers for * \param[in] buffers the number of IO buffer for each specified operation * \returns zero on success, a negative value on error + * + * The minimum valid buffers to set is always 1. + * The maximum valid buffers is implementation defined, and trying to set a + * value greater than the maximum will return an error. + * Passing \ref buffers with a value of 0 can be used to fetch the maximum value allowed. */ int osmo_iofd_set_io_buffers(struct osmo_io_fd *iofd, enum osmo_io_op op, uint8_t buffers) { if (iofd->mode != OSMO_IO_FD_MODE_READ_WRITE) return -EINVAL; - if (buffers < 1 || buffers > IOFD_MSGHDR_IO_BUFFERS) + if (buffers > IOFD_MSGHDR_IO_BUFFERS) return -EINVAL; + if (buffers == 0) + return IOFD_MSGHDR_IO_BUFFERS; + switch (op) { case OSMO_IO_OP_READ: iofd->io_read_buffers = buffers; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41989?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id3d8413c119eb3d9b60aa068295a59561236938c Gerrit-Change-Number: 41989 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: logging_file: Request up to 8 iofd write buffers if available
by pespin 02 Feb '26

02 Feb '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/41990?usp=email ) Change subject: logging_file: Request up to 8 iofd write buffers if available ...................................................................... logging_file: Request up to 8 iofd write buffers if available This should help in decreasing latency between submitting a logging line and getting it written to file. It should, for the same reason, optimize CPU use. Change-Id: Ia88b27948922d278e0f72fc2aac4b4ae88465b4d --- M src/core/logging_file.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/logging_file.c b/src/core/logging_file.c index 9c7cf36..067f993 100644 --- a/src/core/logging_file.c +++ b/src/core/logging_file.c @@ -253,6 +253,10 @@ _log_target_file_setup_talloc_pool(target); osmo_iofd_set_txqueue_max_length(iofd, OSMO_MAX(osmo_iofd_get_txqueue_max_length(iofd), LOG_WQUEUE_LEN)); + /* Request to use 8 write buffers, or less if not as many are available: */ + rc = osmo_iofd_set_io_buffers(iofd, OSMO_IO_OP_WRITE, 0); + rc = osmo_iofd_set_io_buffers(iofd, OSMO_IO_OP_WRITE, OSMO_MIN(rc, 8)); + rc = osmo_iofd_register(iofd, -1); if (rc < 0) { osmo_iofd_free(iofd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia88b27948922d278e0f72fc2aac4b4ae88465b4d Gerrit-Change-Number: 41990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: logging_file: Request up to 8 iofd write buffers if available
by pespin 02 Feb '26

02 Feb '26

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41990?usp=email ) Change subject: logging_file: Request up to 8 iofd write buffers if available ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41990?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia88b27948922d278e0f72fc2aac4b4ae88465b4d Gerrit-Change-Number: 41990 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Feb 2026 13:51:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log February 2026