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

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

27 Jan '26

pespin has submitted this change. ( 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, 382 insertions(+), 328 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/logging_internal.h b/include/osmocom/core/logging_internal.h index 2e65660..68d4c4b 100644 --- a/include/osmocom/core/logging_internal.h +++ b/include/osmocom/core/logging_internal.h @@ -4,8 +4,12 @@ * @{ * \file logging_internal.h */ +#include <osmocom/core/logging.h> #include <osmocom/core/utils.h> +/* maximum length of the log string of a single log event (typically line) */ +#define MAX_LOG_SIZE 4096 + extern void *tall_log_ctx; extern struct log_info *osmo_log_info; extern const struct value_string loglevel_strs[]; @@ -13,4 +17,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 479513a..af5698a 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -62,7 +62,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> -#include <osmocom/core/logging.h> +#include <osmocom/core/logging_internal.h> #include <osmocom/core/timer.h> #include <osmocom/core/thread.h> #include <osmocom/core/select.h> @@ -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 @@ -778,13 +759,19 @@ continue; /* According to the manpage, vsnprintf leaves the value of ap - * in undefined state. Since _output uses vsnprintf and it may + * in undefined state. Since log_output_buf 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..a9a1cb7 --- /dev/null +++ b/src/core/logging_file.c @@ -0,0 +1,356 @@ +/*! \file logging_file.c + * File & stderr logging support code. */ +/* + * (C) 2025-2026 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 <unistd.h> + +#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: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8e32e31c75b66ff0649d92c2f469f8895689fbad Gerrit-Change-Number: 41894 Gerrit-PatchSet: 10 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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]: remove references to define EMBEDDED in public headers
by pespin 27 Jan '26

27 Jan '26

Attention is currently required from: fixeria, jolly. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41932?usp=email ) Change subject: remove references to define EMBEDDED in public headers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41932?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: I7a657d67077dfbe861959c6123eb9163bc791694 Gerrit-Change-Number: 41932 Gerrit-PatchSet: 2 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> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jan 2026 21:08:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmocore[master]: socket_compat.h improvements to always have struct osmo_sockaddr avai...
by pespin 27 Jan '26

27 Jan '26

Attention is currently required from: daniel, fixeria, jolly. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/41931?usp=email ) Change subject: socket_compat.h improvements to always have struct osmo_sockaddr available ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41931?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: I5b10e09770727c72812af15360ab3385b957509b Gerrit-Change-Number: 41931 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jan 2026 21:08:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: xua_snm: Fix typo in comment
by fixeria 27 Jan '26

27 Jan '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41957?usp=email ) Change subject: xua_snm: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41957?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I533809a0d319e75f2f18c706ddc4318503b9915a Gerrit-Change-Number: 41957 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jan 2026 21:08:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: xua: Implement User Part Unavailable HMDT -> HMRT
by fixeria 27 Jan '26

27 Jan '26

Attention is currently required from: daniel, osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41949?usp=email ) Change subject: xua: Implement User Part Unavailable HMDT -> HMRT ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41949?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Iab2ffc3a86243d5eeedcc4fd3d558796ede9afc3 Gerrit-Change-Number: 41949 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jan 2026 21:08:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-abis[master]: lapd-over-datagram-user: fix printf format for timeval fields
by pespin 27 Jan '26

27 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41955?usp=email ) Change subject: lapd-over-datagram-user: fix printf format for timeval fields ...................................................................... lapd-over-datagram-user: fix printf format for timeval fields Use inttypes.h and PRI* macros when printing struct timeval members. This avoids format string mismatches and makes the example code portable across architectures where time_t / suseconds_t may differ in size. No functional change intended. Change-Id: I7067eae1132c604aff3b37e5dff06fadb0759cb6 --- M doc/examples/lapd-over-datagram/lapd-over-datagram-user.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c b/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c index 5eb58e8..eeabe01 100644 --- a/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c +++ b/doc/examples/lapd-over-datagram/lapd-over-datagram-user.c @@ -5,6 +5,7 @@ #include <signal.h> #include <unistd.h> #include <arpa/inet.h> +#include <inttypes.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> @@ -163,8 +164,8 @@ timersub(&tv, &found->tv, &diff); LOGP(DLINP, LOGL_NOTICE, "message %d replied " - "in %lu.%.6lu\n", - num, diff.tv_sec, diff.tv_usec); + "in %" PRIdMAX ".%.6" PRIdMAX "\n", + num, (intmax_t)diff.tv_sec, (intmax_t)diff.tv_usec); talloc_free(found); } else { LOGP(DLINP, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41955?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7067eae1132c604aff3b37e5dff06fadb0759cb6 Gerrit-Change-Number: 41955 Gerrit-PatchSet: 2 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-abis[master]: gitignore: ignore generated .wasm files
by pespin 27 Jan '26

27 Jan '26

Attention is currently required from: Timur Davydov. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41956?usp=email ) Change subject: gitignore: ignore generated .wasm files ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41956?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I879e698f2d514cf6e2f7bb33b4d6148f79aea6f6 Gerrit-Change-Number: 41956 Gerrit-PatchSet: 3 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Mon, 26 Jan 2026 21:07:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-abis[master]: lapd-over-datagram-user: fix printf format for timeval fields
by pespin 27 Jan '26

27 Jan '26

Attention is currently required from: Timur Davydov. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41955?usp=email ) Change subject: lapd-over-datagram-user: fix printf format for timeval fields ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41955?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7067eae1132c604aff3b37e5dff06fadb0759cb6 Gerrit-Change-Number: 41955 Gerrit-PatchSet: 2 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Mon, 26 Jan 2026 21:07:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-netif[master]: stream: Fix build with --disable-libsctp
by pespin 27 Jan '26

27 Jan '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/41952?usp=email ) Change subject: stream: Fix build with --disable-libsctp ...................................................................... stream: Fix build with --disable-libsctp Guard SCTP-specific includes and code paths with HAVE_LIBSCTP to allow building libosmo-netif without libsctp support. This avoids unconditional inclusion of <osmocom/netif/sctp.h> and ensures that SCTP-specific variables and send paths are only compiled when SCTP support is enabled. No functional change when HAVE_LIBSCTP is defined. Change-Id: I07ef25f3fcc39f9bee023d9264a72c4381b82b65 --- M src/stream.c M src/stream_cli.c M src/stream_srv.c 3 files changed, 19 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/stream.c b/src/stream.c index e2aaf59..6773005 100644 --- a/src/stream.c +++ b/src/stream.c @@ -49,12 +49,12 @@ #include "config.h" -#include <osmocom/netif/sctp.h> - /*! \cond private */ #ifdef HAVE_LIBSCTP +#include <osmocom/netif/sctp.h> + /* is any of the bytes from offset .. u8_size in 'u8' non-zero? return offset or -1 if all zero */ static int byte_nonzero(const uint8_t *u8, unsigned int offset, unsigned int u8_size) { diff --git a/src/stream_cli.c b/src/stream_cli.c index b098e4a..e59122b 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -49,7 +49,9 @@ #include "config.h" +#ifdef HAVE_LIBSCTP #include <osmocom/netif/sctp.h> +#endif /*! \file stream_cli.c */ @@ -1243,9 +1245,8 @@ * \return negative on error, 0 on success */ int osmo_stream_cli_open(struct osmo_stream_cli *cli) { - int ret, flags; + int ret; int fd = -1; - unsigned int local_addrcnt; /* we are reconfiguring this socket, close existing first. */ if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_get_fd(cli) >= 0) { @@ -1265,8 +1266,9 @@ switch (cli->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: - local_addrcnt = cli->local_addrcnt; - flags = OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK | + { + unsigned int local_addrcnt = cli->local_addrcnt; + int flags = OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK | OSMO_SOCK_F_DSCP(cli->ip_dscp) | OSMO_SOCK_F_PRIO(cli->sk_prio); if (cli->local_addrcnt > 0 || cli->local_port > 0) { /* explicit bind required? */ flags |= OSMO_SOCK_F_BIND; @@ -1279,6 +1281,7 @@ (const char **)cli->addr, cli->addrcnt, cli->port, flags, &cli->ma_pars); break; + } #endif default: ret = osmo_sock_init2(cli->sk_domain, cli->sk_type, cli->proto, @@ -1402,9 +1405,11 @@ case OSMO_STREAM_MODE_OSMO_IO: /* whenever osmo_stream_cli_is_connected() [see above check], we should have an iofd */ OSMO_ASSERT(cli->iofd); +#ifdef HAVE_LIBSCTP if (cli->proto == IPPROTO_SCTP) rc = stream_iofd_sctp_send_msgb(cli->iofd, msg, MSG_NOSIGNAL); else +#endif rc = osmo_iofd_write_msgb(cli->iofd, msg); if (rc < 0) msgb_free(msg); diff --git a/src/stream_srv.c b/src/stream_srv.c index 3abc55a..140515f 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -50,7 +50,9 @@ #include "config.h" +#ifdef HAVE_LIBSCTP #include <osmocom/netif/sctp.h> +#endif /*! \file stream_srv.c */ @@ -1045,12 +1047,15 @@ osmo_sock_get_name_buf(conn->sockname, sizeof(conn->sockname), fd); +#ifdef HAVE_LIBSCTP if (link->proto == IPPROTO_SCTP) { conn->iofd = osmo_iofd_setup(conn, fd, conn->sockname, OSMO_IO_FD_MODE_RECVMSG_SENDMSG, &srv_ioops_sctp, conn); if (conn->iofd) osmo_iofd_set_cmsg_size(conn->iofd, CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))); - } else { + } else +#endif + { conn->iofd = osmo_iofd_setup(conn, fd, conn->sockname, OSMO_IO_FD_MODE_READ_WRITE, &srv_ioops, conn); } @@ -1379,9 +1384,11 @@ osmo_fd_write_enable(&conn->ofd); break; case OSMO_STREAM_MODE_OSMO_IO: +#ifdef HAVE_LIBSCTP if (conn->srv->proto == IPPROTO_SCTP) rc = stream_iofd_sctp_send_msgb(conn->iofd, msg, MSG_NOSIGNAL); else +#endif rc = osmo_iofd_write_msgb(conn->iofd, msg); if (rc < 0) msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/41952?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I07ef25f3fcc39f9bee023d9264a72c4381b82b65 Gerrit-Change-Number: 41952 Gerrit-PatchSet: 4 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-netif[master]: gitignore: ignore generated .wasm files
by pespin 27 Jan '26

27 Jan '26

Attention is currently required from: Timur Davydov, laforge. pespin has posted comments on this change by Timur Davydov. ( https://gerrit.osmocom.org/c/libosmo-netif/+/41953?usp=email ) Change subject: gitignore: ignore generated .wasm files ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/41953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I023158cc39989d6fe98080fecb61410aa4e535ab Gerrit-Change-Number: 41953 Gerrit-PatchSet: 5 Gerrit-Owner: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: Timur Davydov <dtv.comp(a)gmail.com> Gerrit-Comment-Date: Mon, 26 Jan 2026 21:07:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log January 2026