- gerrit-log - lists.osmocom.org

[L] Change in libosmocore[master]: logging: Move log target file to its own file
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/41894?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: logging: Move log target file to its own file ...................................................................... logging: Move log target file to its own file We already have all other log_target implementations each on its own file. Move the file (and stderr, a specific case of file) into its own file too, properly separating most file-specific logic from general logging logic. Change-Id: I8e32e31c75b66ff0649d92c2f469f8895689fbad --- M include/osmocom/core/logging_internal.h M src/core/Makefile.am M src/core/logging.c A src/core/logging_file.c 4 files changed, 379 insertions(+), 326 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/41894/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41894?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8e32e31c75b66ff0649d92c2f469f8895689fbad Gerrit-Change-Number: 41894 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmocore[master]: logging: Move log target file to its own file
by pespin 20 Jan '26

20 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41894?usp=email ) Change subject: logging: Move log target file to its own file ...................................................................... logging: Move log target file to its own file We already have all other log_target implementations each on its own file. Move the file (and stderr, a specific case of file) into its own file too, properly separating most file-specific logic from general logging logic. Change-Id: I8e32e31c75b66ff0649d92c2f469f8895689fbad --- M include/osmocom/core/logging_internal.h M src/core/Makefile.am M src/core/logging.c A src/core/logging_file.c 4 files changed, 384 insertions(+), 326 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/41894/1 diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index 6fc9b2a..cadd4df 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -10,6 +10,9 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/logging.h> +/* maximum length of the log string of a single log event (typically line) */ +#define MAX_LOG_SIZE 4096 + /*! Log context information, passed to filter */ struct log_context { void *ctx[LOG_MAX_CTX+1] OSMO_DEPRECATED_OUTSIDE("Accessing struct log_context members directly is deprecated"); @@ -119,4 +122,10 @@ void assert_loginfo(const char *src); +int log_output_buf(char *buf, int buf_len, struct log_target *target, unsigned int subsys, + unsigned int level, const char *file, int line, int cont, + const char *format, va_list ap); + +void log_target_file_destroy(struct log_target *target); + /*! @} */ diff --git a/src/core/Makefile.am b/src/core/Makefile.am index f2cf138..1c0bfed 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -44,6 +44,7 @@ isdnhdlc.c \ it_q.c \ logging.c \ + logging_file.c \ logging_gsmtap.c \ loggingrb.c \ macaddr.c \ diff --git a/src/core/logging.c b/src/core/logging.c index e8c48b8..0482342 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -71,12 +71,6 @@ #include <osmocom/vty/logging.h> /* for LOGGING_STR. */ -/* 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 - osmo_static_assert(_LOG_CTX_COUNT <= ARRAY_SIZE(((struct log_context*)NULL)->ctx), enum_logging_ctx_items_fit_in_struct_log_context); osmo_static_assert(_LOG_FLT_COUNT <= ARRAY_SIZE(((struct log_target*)NULL)->filter_data), @@ -566,9 +560,9 @@ * \param[in] format format string * \param[in] ap variable argument list for format * \returns number of bytes written to out */ -static int _output_buf(char *buf, int buf_len, struct log_target *target, unsigned int subsys, - unsigned int level, const char *file, int line, int cont, - const char *format, va_list ap) +int log_output_buf(char *buf, int buf_len, struct log_target *target, unsigned int subsys, + unsigned int level, const char *file, int line, int cont, + const char *format, va_list ap) { int ret; const char *c_subsys = NULL; @@ -679,19 +673,6 @@ return OSMO_STRBUF_CHAR_COUNT(sb); } -/* Format the log line for given target; use a stack buffer and call target->output */ -static void _output(struct log_target *target, unsigned int subsys, - unsigned int level, const char *file, int line, int cont, - const char *format, va_list ap) -{ - char buf[MAX_LOG_SIZE]; - int rc; - - rc = _output_buf(buf, sizeof(buf), target, subsys, level, file, line, cont, format, ap); - if (rc > 0) - target->output(target, level, buf); -} - /* Catch internal logging category indexes as well as out-of-bounds indexes. * For internal categories, the ID is negative starting with -1; and internal * logging categories are added behind the user categories. For out-of-bounds @@ -781,10 +762,16 @@ * in undefined state. Since _output uses vsnprintf and it may * be called several times, we have to pass a copy of ap. */ va_copy(bp, ap); - if (tar->raw_output) + if (tar->raw_output) { tar->raw_output(tar, subsys, level, file, line, cont, format, bp); - else - _output(tar, subsys, level, file, line, cont, format, bp); + } else { + /* Format the log line for given target; use a stack buffer and call target->output */ + char buf[MAX_LOG_SIZE]; + int rc = log_output_buf(buf, sizeof(buf), tar, subsys, level, + file, line, cont, format, bp); + if (rc > 0) + tar->output(tar, level, buf); + } va_end(bp); } @@ -1138,69 +1125,6 @@ #endif } -#if (!EMBEDDED) -/* 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; -} - -/* output via buffered, blocking stdio streams */ -static void _file_output_stream(struct log_target *target, unsigned int level, - const char *log) -{ - OSMO_ASSERT(target->tgt_file.out); - fputs(log, target->tgt_file.out); - fflush(target->tgt_file.out); -} - -/* output via non-blocking write_queue, doing internal buffering */ -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) -{ - struct msgb *msg; - int rc; - - OSMO_ASSERT(target->tgt_file.wqueue); - msg = msgb_alloc_c(target->tgt_file.wqueue, 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 = _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) { - msgb_free(msg); - /* TODO: increment some counter so we can see that messages were dropped */ - } -} -#endif - /*! Create a new log target skeleton * \returns dynamically-allocated log target * This funcition allocates a \ref log_target and initializes it @@ -1256,188 +1180,6 @@ return target; } -/*! Create the STDERR log target - * \returns dynamically-allocated \ref log_target for STDERR */ -struct log_target *log_target_create_stderr(void) -{ -/* since C89/C99 says stderr is a macro, we can safely do this! */ -#if !EMBEDDED && defined(stderr) - struct log_target *target; - - target = log_target_create(); - if (!target) - return NULL; - - target->type = LOG_TGT_TYPE_STDERR; - target->tgt_file.out = stderr; - target->output = _file_output_stream; - return target; -#else - return NULL; -#endif /* stderr */ -} - -#if (!EMBEDDED) - -/*! 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 - * Must be called with mutex osmo_log_tgt_mutex held, see log_tgt_mutex_lock. - */ -int log_target_file_switch_to_stream(struct log_target *target) -{ - struct osmo_wqueue *wq; - - if (!target) - return -ENODEV; - - if (target->tgt_file.out) { - /* target has already been switched over */ - 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); - } - - /* now that everything succeeded, we can finally close the old output fd */ - if (target->type == LOG_TGT_TYPE_FILE) { - osmo_fd_unregister(&wq->bfd); - close(wq->bfd.fd); - wq->bfd.fd = -1; - } - - /* release the queue itself */ - talloc_free(wq); - target->tgt_file.wqueue = NULL; - target->output = _file_output_stream; - target->raw_output = NULL; - - return 0; -} - -/*! switch from blocking + buffered file output to non-blocking write-queue based output. - * \param[in] target log target which we should switch - * \return 0 on success; 1 if already switched before; negative on error - * Must be called with mutex osmo_log_tgt_mutex held, see log_tgt_mutex_lock. - */ -int log_target_file_switch_to_wqueue(struct log_target *target) -{ - struct osmo_wqueue *wq; - int rc; - - if (!target) - return -ENODEV; - - if (!target->tgt_file.out) { - /* target has already been switched over */ - 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; - - rc = osmo_fd_register(&wq->bfd); - if (rc < 0) { - talloc_free(wq); - return -EIO; - } - target->tgt_file.wqueue = wq; - target->raw_output = _file_raw_output; - target->output = NULL; - - /* now that everything succeeded, we can finally close the old output stream */ - if (target->type == LOG_TGT_TYPE_FILE) - fclose(target->tgt_file.out); - target->tgt_file.out = NULL; - - return 0; -} - -/*! Create a new file-based log target using non-blocking write_queue - * \param[in] fname File name of the new log file - * \returns Log target in case of success, NULL otherwise - */ -struct log_target *log_target_create_file(const char *fname) -{ - struct log_target *target; - struct osmo_wqueue *wq; - int rc; - - 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); - - return target; -} -#endif - /*! Find a registered log target * \param[in] type Log target type * \param[in] fname File name @@ -1475,29 +1217,10 @@ log_del_target(target); #if (!EMBEDDED) - struct osmo_wqueue *wq; switch (target->type) { case LOG_TGT_TYPE_FILE: case LOG_TGT_TYPE_STDERR: - if (target->tgt_file.out) { - if (target->type == LOG_TGT_TYPE_FILE) - 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; - } - talloc_free((void *)target->tgt_file.fname); - target->tgt_file.fname = NULL; + log_target_file_destroy(target); break; case LOG_TGT_TYPE_GSMTAP: gsmtap_source_free(target->tgt_gsmtap.gsmtap_inst); @@ -1516,42 +1239,6 @@ talloc_free(target); } -/*! 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; - int rc; - - OSMO_ASSERT(target->type == LOG_TGT_TYPE_FILE || target->type == LOG_TGT_TYPE_STDERR); - OSMO_ASSERT(target->tgt_file.out || target->tgt_file.wqueue); - - if (target->tgt_file.out) { - fclose(target->tgt_file.out); - target->tgt_file.out = fopen(target->tgt_file.fname, "a"); - if (!target->tgt_file.out) - return -errno; - } else { - wq = target->tgt_file.wqueue; - if (wq->bfd.fd >= 0) { - osmo_fd_unregister(&wq->bfd); - close(wq->bfd.fd); - wq->bfd.fd = -1; - } - - 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; - } - - return 0; -} - /*! close and re-open all log files (for log file rotation) * \returns 0 in case of success; negative otherwise */ int log_targets_reopen(void) diff --git a/src/core/logging_file.c b/src/core/logging_file.c new file mode 100644 index 0000000..d7dfcd0 --- /dev/null +++ b/src/core/logging_file.c @@ -0,0 +1,361 @@ +/*! \file logging_file.c + * Syslog logging support code. */ +/* + * (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2008-2010 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2008 by Holger Hans Peter Freyther <zecke(a)selfish.org> + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +/*! \addtogroup logging + * @{ + * \file logging_file.c */ + +#include "config.h" + +#include <errno.h> +#include <fcntl.h> +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <syslog.h> +#include <unistd.h> + +#ifdef HAVE_STRINGS_H +#include <strings.h> +#endif + +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/select.h> +#include <osmocom/core/write_queue.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 + + +/*! 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; + int rc; + + OSMO_ASSERT(target->type == LOG_TGT_TYPE_FILE || target->type == LOG_TGT_TYPE_STDERR); + OSMO_ASSERT(target->tgt_file.out || target->tgt_file.wqueue); + + if (target->tgt_file.out) { + fclose(target->tgt_file.out); + target->tgt_file.out = fopen(target->tgt_file.fname, "a"); + if (!target->tgt_file.out) + return -errno; + } else { + wq = target->tgt_file.wqueue; + if (wq->bfd.fd >= 0) { + osmo_fd_unregister(&wq->bfd); + close(wq->bfd.fd); + wq->bfd.fd = -1; + } + + 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; + } + + return 0; +} + +#if (!EMBEDDED) + +/* This is the file-specific subclass destructor logic, called from + * log_target_destroy(). User should call log_target_destroy() to destroy this + * 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); + + if (target->tgt_file.out) { + if (target->type == LOG_TGT_TYPE_FILE) + 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; + } + 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; +} + +/* output via buffered, blocking stdio streams */ +static void _file_output_stream(struct log_target *target, unsigned int level, + const char *log) +{ + OSMO_ASSERT(target->tgt_file.out); + fputs(log, target->tgt_file.out); + fflush(target->tgt_file.out); +} + +/* output via non-blocking write_queue, doing internal buffering */ +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) +{ + struct msgb *msg; + int rc; + + OSMO_ASSERT(target->tgt_file.wqueue); + msg = msgb_alloc_c(target->tgt_file.wqueue, 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); + 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) { + msgb_free(msg); + /* TODO: increment some counter so we can see that messages were dropped */ + } +} + +/*! 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 + * Must be called with mutex osmo_log_tgt_mutex held, see log_tgt_mutex_lock. + */ +int log_target_file_switch_to_stream(struct log_target *target) +{ + struct osmo_wqueue *wq; + + if (!target) + return -ENODEV; + + if (target->tgt_file.out) { + /* target has already been switched over */ + 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); + } + + /* now that everything succeeded, we can finally close the old output fd */ + if (target->type == LOG_TGT_TYPE_FILE) { + osmo_fd_unregister(&wq->bfd); + close(wq->bfd.fd); + wq->bfd.fd = -1; + } + + /* release the queue itself */ + talloc_free(wq); + target->tgt_file.wqueue = NULL; + target->output = _file_output_stream; + target->raw_output = NULL; + + return 0; +} + +/*! switch from blocking + buffered file output to non-blocking write-queue based output. + * \param[in] target log target which we should switch + * \return 0 on success; 1 if already switched before; negative on error + * Must be called with mutex osmo_log_tgt_mutex held, see log_tgt_mutex_lock. + */ +int log_target_file_switch_to_wqueue(struct log_target *target) +{ + struct osmo_wqueue *wq; + int rc; + + if (!target) + return -ENODEV; + + if (!target->tgt_file.out) { + /* target has already been switched over */ + 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; + + rc = osmo_fd_register(&wq->bfd); + if (rc < 0) { + talloc_free(wq); + return -EIO; + } + target->tgt_file.wqueue = wq; + target->raw_output = _file_raw_output; + target->output = NULL; + + /* now that everything succeeded, we can finally close the old output stream */ + if (target->type == LOG_TGT_TYPE_FILE) + fclose(target->tgt_file.out); + target->tgt_file.out = NULL; + + return 0; +} + +/*! Create a new file-based log target using non-blocking write_queue + * \param[in] fname File name of the new log file + * \returns Log target in case of success, NULL otherwise + */ +struct log_target *log_target_create_file(const char *fname) +{ + struct log_target *target; + struct osmo_wqueue *wq; + int rc; + + 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); + + return target; +} +#endif + +/*! Create the STDERR log target + * \returns dynamically-allocated \ref log_target for STDERR */ +struct log_target *log_target_create_stderr(void) +{ +/* since C89/C99 says stderr is a macro, we can safely do this! */ +#if !EMBEDDED && defined(stderr) + struct log_target *target; + + target = log_target_create(); + if (!target) + return NULL; + + target->type = LOG_TGT_TYPE_STDERR; + target->tgt_file.out = stderr; + target->output = _file_output_stream; + return target; +#else + return NULL; +#endif /* stderr */ +} + +/* @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41894?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8e32e31c75b66ff0649d92c2f469f8895689fbad Gerrit-Change-Number: 41894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: build: control USE_NETNS via configure.ac
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: Timur Davydov. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmocore/+/41878?usp=email ) Change subject: build: control USE_NETNS via configure.ac ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: @dtv.comp@gmail.com Can you please share here what *exactly* fails when you build the netns.c in emscripten? which error do you get? at buildtime? at runtime? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41878?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: I2322eb2936bea35596f1fd6b6a713ea5f997b1ea Gerrit-Change-Number: 41878 Gerrit-PatchSet: 2 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Tue, 20 Jan 2026 16:05:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in libosmocore[master]: logging: Make struct log_context and struct log_target private
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/41891?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: logging: Make struct log_context and struct log_target private ...................................................................... logging: Make struct log_context and struct log_target private Change-Id: Iecbd07995ccb465a44be0debcc97458b2b240a0e --- M TODO-RELEASE M include/osmocom/core/logging.h M include/osmocom/core/logging_internal.h M src/core/logging.c M src/core/logging_gsmtap.c M src/core/logging_syslog.c M src/core/logging_systemd.c M src/core/loggingrb.c 8 files changed, 116 insertions(+), 112 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/91/41891/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iecbd07995ccb465a44be0debcc97458b2b240a0e Gerrit-Change-Number: 41891 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: build: control USE_NETNS via configure.ac
by Timur Davydov 20 Jan '26

20 Jan '26

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/41878?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: build: control USE_NETNS via configure.ac ...................................................................... build: control USE_NETNS via configure.ac Define USE_NETNS based on host_os and disable it for embedded builds. No functional changes intended, this is a preparatory refactor to keep follow-up patches focused and easier to review. Change-Id: I2322eb2936bea35596f1fd6b6a713ea5f997b1ea --- M configure.ac M include/osmocom/core/netns.h M src/core/Makefile.am 3 files changed, 22 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/41878/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2322eb2936bea35596f1fd6b6a713ea5f997b1ea Gerrit-Change-Number: 41878 Gerrit-PatchSet: 2 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: Remove unused private API log_target_create_file_stream()
by pespin 20 Jan '26

20 Jan '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41893?usp=email ) Change subject: Remove unused private API log_target_create_file_stream() ...................................................................... Remove unused private API log_target_create_file_stream() This function was never added to the logging.h (despite it was not static and it was inside libosmocore.map). It is actually used nowhere, and changing it to static made the compiler warn about it. Remove it. Change-Id: Ia30c6b47cfcbb54e7c2c43b877cd9554dc596abf --- M src/core/libosmocore.map M src/core/logging.c 2 files changed, 0 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/41893/1 diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 3ec322c..cb79843 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -96,7 +96,6 @@ log_set_use_color; log_target_create; log_target_create_file; -log_target_create_file_stream; log_target_create_gsmtap; log_target_create_rb; log_target_create_stderr; diff --git a/src/core/logging.c b/src/core/logging.c index 748dd8f..e8c48b8 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -1278,29 +1278,6 @@ } #if (!EMBEDDED) -/*! Create a new file-based log target using buffered, blocking stream output - * \param[in] fname File name of the new log file - * \returns Log target in case of success, NULL otherwise - */ -struct log_target *log_target_create_file_stream(const char *fname) -{ - struct log_target *target; - - target = log_target_create(); - if (!target) - return NULL; - - target->type = LOG_TGT_TYPE_FILE; - target->tgt_file.out = fopen(fname, "a"); - if (!target->tgt_file.out) { - log_target_destroy(target); - return NULL; - } - target->output = _file_output_stream; - target->tgt_file.fname = talloc_strdup(target, fname); - - return target; -} /*! switch from non-blocking/write-queue to blocking + buffered stream output * \param[in] target log target which we should switch -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41893?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia30c6b47cfcbb54e7c2c43b877cd9554dc596abf Gerrit-Change-Number: 41893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmocore[master]: logging: Make struct log_context and struct log_target private
by fixeria 20 Jan '26

20 Jan '26

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41891?usp=email ) Change subject: logging: Make struct log_context and struct log_target private ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Indeed. […] I am not strictly against breaking API at some point (ideally once, applying similar patches removing deprecated stuff). After all, there have been changes breaking old code in less obvious ways, like https://osmocom.org/issues/6728 (talloc parentship mess), so what's the point of ensuring that old code compiles given that it will just crash at run-time (referring to https://osmocom.org/issues/6728 again here). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41891?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: Iecbd07995ccb465a44be0debcc97458b2b240a0e Gerrit-Change-Number: 41891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 14:36:44 +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

[M] Change in libosmocore[master]: logging: Make struct log_context and struct log_target private
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41891?usp=email ) Change subject: logging: Make struct log_context and struct log_target private ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Indeed. […] For reference, these are the projects which required a patch to avoid accessing struct members: osmo-bsc, osmo-gbproxy, osmo-msc, osmo-pcu, osmo-bts, osmo-trx. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41891?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: Iecbd07995ccb465a44be0debcc97458b2b240a0e Gerrit-Change-Number: 41891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 14:32:40 +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

[S] Change in docker-playground[master]: debian-trixie-build: install the osmocom:misc repo
by osmith 20 Jan '26

20 Jan '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/41892?usp=email ) Change subject: debian-trixie-build: install the osmocom:misc repo ...................................................................... debian-trixie-build: install the osmocom:misc repo Install the osmocom:misc repository, so we can use the latest bpftrace version in ttcn3-bts-test. Related: OS#6927 Change-Id: I58e91932b089a92f4f4c31814cd1fd7d202b04c0 --- M debian-trixie-build/Dockerfile M debian-trixie-obs-latest/Dockerfile 2 files changed, 18 insertions(+), 8 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian-trixie-build/Dockerfile b/debian-trixie-build/Dockerfile index b046748..dcac78e 100644 --- a/debian-trixie-build/Dockerfile +++ b/debian-trixie-build/Dockerfile @@ -6,7 +6,8 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" ARG OSMOCOM_REPO_PATH="packages/osmocom:" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_13/" +ARG OSMOCOM_REPO_NIGHTLY="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_13/" +ARG OSMOCOM_REPO_MISC="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/misc/Debian_13/" ARG UID ARG LLVM_VERSION="14.0.0" @@ -221,11 +222,17 @@ ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format… /tmp/osmo-gsm-manuals-commit RUN git -C /opt clone --depth=1 https://gerrit.osmocom.org/osmo-gsm-manuals +# Install the Osmocom OBS misc repository +ADD $OSMOCOM_REPO_MISC/Release /tmp/Release +RUN set -x && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO_MISC ./" \ + > /etc/apt/sources.list.d/osmocom-misc.list + # Install packages from Osmocom OBS nightly repository # * osmo-trx: sdcc (OS#6748) -ADD $OSMOCOM_REPO/Release /tmp/Release +ADD $OSMOCOM_REPO_NIGHTLY/Release /tmp/Release RUN set -x && \ - echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO ./" \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/obs.osmocom.org.asc] $OSMOCOM_REPO_NIGHTLY ./" \ > /etc/apt/sources.list.d/osmocom-nightly.list && \ apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/debian-trixie-obs-latest/Dockerfile b/debian-trixie-obs-latest/Dockerfile index 691f621..4603e29 100644 --- a/debian-trixie-obs-latest/Dockerfile +++ b/debian-trixie-obs-latest/Dockerfile @@ -5,7 +5,8 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" ARG OSMOCOM_REPO_PATH="packages/osmocom:" -ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_13/" +ARG OSMOCOM_REPO_LATEST="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_13/" +ARG OSMOCOM_REPO_MISC="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/misc/Debian_13/" ARG UID # Copy from common dir @@ -23,7 +24,7 @@ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ rm -rf /usr/share/man/ -# Configure Osmocom latest repository, add telnet for debugging +# Configure Osmocom repositories, add telnet for debugging RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ @@ -31,8 +32,10 @@ telnet \ && \ apt-get clean && \ - echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-latest.list + echo "deb [signed-by=/usr/share/keyrings/osmocom-latest.asc] $OSMOCOM_REPO_LATEST ./" \ + > /etc/apt/sources.list.d/osmocom-latest.list && \ + echo "deb [signed-by=/usr/share/keyrings/osmocom-misc.asc] $OSMOCOM_REPO_MISC ./" \ + > /etc/apt/sources.list.d/osmocom-misc.list # Invalidate cache once the repository is updated -ADD $OSMOCOM_REPO/Release /tmp/Release +ADD $OSMOCOM_REPO_LATEST/Release /tmp/Release -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I58e91932b089a92f4f4c31814cd1fd7d202b04c0 Gerrit-Change-Number: 41892 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in docker-playground[master]: debian-trixie-build: install the osmocom:misc repo
by pespin 20 Jan '26

20 Jan '26

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/41892?usp=email ) Change subject: debian-trixie-build: install the osmocom:misc repo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I58e91932b089a92f4f4c31814cd1fd7d202b04c0 Gerrit-Change-Number: 41892 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jan 2026 14:21:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log