pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/44137?usp=email ) Change subject: core: osmo_init_logging2(): Log talloc output through osmo_logging system ...................................................................... core: osmo_init_logging2(): Log talloc output through osmo_logging system The logging functionality of talloc is mainly used to log warnings and errors about spotted problems. By default, the logging callback is NULL and hence nothing is printed. Set up the callback so we can print the problems spotted. Change-Id: Ibe85438616d731636579981cce3756922295f48a --- M src/core/application.c M src/pseudotalloc/pseudotalloc.c M src/pseudotalloc/talloc.h 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/core/application.c b/src/core/application.c index bb89adb..e71f4e2 100644 --- a/src/core/application.c +++ b/src/core/application.c @@ -78,6 +78,7 @@ #include <unistd.h> #include <errno.h> #include <sys/stat.h> +#include <talloc.h> struct log_target *osmo_stderr_target; @@ -102,6 +103,11 @@ #endif } +static void log_talloc_cb(const char *message) +{ + LOGP(DLGLOBAL, LOGL_NOTICE, "%s", message); +} + /*! Initialize the osmocom logging framework * \param[in] log_info Array of available logging sub-systems * \returns 0 on success, -1 in case of error @@ -114,6 +120,7 @@ return osmo_init_logging2(NULL, log_info); } + int osmo_init_logging2(void *ctx, const struct log_info *log_info) { static int logging_initialized = 0; @@ -129,6 +136,8 @@ log_add_target(osmo_stderr_target); log_set_all_filter(osmo_stderr_target, 1); + + talloc_set_log_fn(log_talloc_cb); return 0; } diff --git a/src/pseudotalloc/pseudotalloc.c b/src/pseudotalloc/pseudotalloc.c index 895c6dd..86d2a08 100644 --- a/src/pseudotalloc/pseudotalloc.c +++ b/src/pseudotalloc/pseudotalloc.c @@ -117,3 +117,7 @@ vsnprintf(buf, 128, fmt, ap); return buf; } + +void talloc_set_log_fn(void (*log_fn)(const char *message)) +{ +} diff --git a/src/pseudotalloc/talloc.h b/src/pseudotalloc/talloc.h index 3893599..372e3fb 100644 --- a/src/pseudotalloc/talloc.h +++ b/src/pseudotalloc/talloc.h @@ -65,3 +65,5 @@ #define talloc_steal(ctx, ptr) _talloc_steal_loc((ctx), (ptr), __location__) void *_talloc_steal_loc(const void *new_ctx, const void *obj, const char *location); char *talloc_vasprintf(const void *t, const char *fmt, va_list ap); + +void talloc_set_log_fn(void (*log_fn)(const char *message)); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/44137?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: Ibe85438616d731636579981cce3756922295f48a Gerrit-Change-Number: 44137 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de>