Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt; --- include/qb/qblog.h | 13 +++++++ lib/log.c | 97 ++++++++++++++++++++++++++++++++++++++++++--------- lib/log_int.h | 2 +- 3 files changed, 94 insertions(+), 18 deletions(-) diff --git a/include/qb/qblog.h b/include/qb/qblog.h index 849a3ab..d17dbba 100644 --- a/include/qb/qblog.h +++ b/include/qb/qblog.h @@ -323,6 +323,19 @@ void qb_log_init(const char *name, void qb_log_fini(void); /** + * If you are using dynamically loadable modules via dlopen() and + * you load them after qb_log_init() then after you load the module + * you will need to do the following to get the filters to work + * in that module. + * @code + * _start = dlsym (dl_handle, "__start___verbose"); + * _stop = dlsym (dl_handle, "__stop___verbose"); + * qb_log_callsites_register(_start, _stop); + * @endcode + */ +void qb_log_callsites_register(struct qb_log_callsite *_start, struct qb_log_callsite *_stop); + +/** * Main logging control function. * * @param t QB_LOG_SYSLOG, QB_LOG_STDERR or result from qb_log_file_open() diff --git a/lib/log.c b/lib/log.c index e3785e7..e6a20f1 100644 --- a/lib/log.c +++ b/lib/log.c @@ -30,10 +30,19 @@ static struct qb_log_target conf[32]; static QB_LIST_DECLARE(active_targets); +static QB_LIST_DECLARE(callsite_sections); static int32_t _log_target_enable(struct qb_log_target *t); static void _log_target_disable(struct qb_log_target *t); + +struct callsite_section { + struct qb_log_callsite * start; + struct qb_log_callsite * stop; + struct qb_list_head list; +}; + + /* deprecated method of getting internal log messages */ static qb_util_log_fn_t old_internal_log_fn = NULL; void qb_util_set_log_function(qb_util_log_fn_t fn) @@ -76,7 +85,7 @@ static int32_t _cs_matches_filter_(struct qb_log_callsite *cs, * 3 pass onto qb_log_real_() * * Later: - * if (cs < __start___verbose in && cs > __stop___verbosed) { + * if (cs < __start___verbose in && cs > __stop___verbose) { * free(cs) * } */ @@ -133,7 +142,7 @@ void qb_log_real_(struct qb_log_callsite *cs, ...) if (in_logger) { return; } - in_logger = QB_TRUE;; + in_logger = QB_TRUE; va_start(ap, cs); len = vsnprintf(buf, COMBINE_BUFFER_SIZE, cs->format, ap); @@ -192,6 +201,35 @@ void qb_log_thread_log_write(struct qb_log_callsite *cs, qb_log_external_source_free(cs); } +void qb_log_callsites_register(struct qb_log_callsite *_start, struct qb_log_callsite *_stop) +{ + struct callsite_section *sect; + struct qb_log_callsite *cs; + struct qb_log_target *t; + struct qb_log_filter *flt; + + if (_start == NULL || _stop == NULL) { + return; + } + sect = calloc(1, sizeof(struct callsite_section)); + sect->start = _start; + sect->stop = _stop; + qb_list_init(&sect->list); + qb_list_add(&sect->list, &callsite_sections); + + /* Now apply the filters on these new callsites + */ + qb_list_for_each_entry(t, &active_targets, active_list) { + qb_list_for_each_entry(flt, &t->filter_head, list) { + for (cs = sect->start; cs < sect->stop; cs++) { + if (_cs_matches_filter_(cs, flt->type, flt->text, flt->priority)) { + qb_bit_set(cs->targets, t->pos); + } + } + } + } +} + int32_t qb_log_filter_ctl(uint32_t t, enum qb_log_filter_conf c, enum qb_log_filter_type type, const char *text, uint32_t priority) @@ -200,12 +238,17 @@ int32_t qb_log_filter_ctl(uint32_t t, enum qb_log_filter_conf c, struct qb_log_filter *flt; struct qb_list_head *iter; struct qb_list_head *next; + struct callsite_section *sect; if (c == QB_LOG_FILTER_ADD) { + + if (text == NULL) { + return -EINVAL; + } flt = calloc(1, sizeof(struct qb_log_filter)); qb_list_init(&flt->list); flt->type = type; - flt->text = text; + flt->text = strdup(text); flt->priority = priority; qb_list_add_tail(&flt->list, &conf[t].filter_head); } else if (c == QB_LOG_FILTER_REMOVE) { @@ -215,6 +258,7 @@ int32_t qb_log_filter_ctl(uint32_t t, enum qb_log_filter_conf c, if (flt->type == type && flt->priority == priority && strcmp(flt->text, text) == 0) { qb_list_del(iter); + free(flt->text); free(flt); } } @@ -223,28 +267,31 @@ int32_t qb_log_filter_ctl(uint32_t t, enum qb_log_filter_conf c, qb_list_for_each_safe(iter, next, &conf[t].filter_head) { flt = qb_list_entry(iter, struct qb_log_filter, list); qb_list_del(iter); + free(flt->text); free(flt); } } - for (cs = __start___verbose; cs < __stop___verbose; cs++) { + qb_list_for_each_entry(sect, &callsite_sections, list) { + for (cs = sect->start; cs < sect->stop; cs++) { - if (c == QB_LOG_FILTER_CLEAR_ALL) { - qb_bit_clear(cs->targets, t); - continue; - } - - if (_cs_matches_filter_(cs, type, text, priority)) { - if (c == QB_LOG_FILTER_ADD) { - qb_bit_set(cs->targets, t); - } else { + if (c == QB_LOG_FILTER_CLEAR_ALL) { qb_bit_clear(cs->targets, t); + continue; } + + if (_cs_matches_filter_(cs, type, text, priority)) { + if (c == QB_LOG_FILTER_ADD) { + qb_bit_set(cs->targets, t); + } else { + qb_bit_clear(cs->targets, t); + } #if 0 - printf("matched: %-12s %20s:%u fmt:<%d>%s\n", - cs->function, cs->filename, cs->lineno, - cs->priority, cs->format); + printf("matched: %20s:%u %-12s()\n", + cs->filename, cs->lineno, + cs->function); #endif + } } } return 0; @@ -266,6 +313,7 @@ void qb_log_init(const char *name, int32_t facility, int32_t priority) } conf[QB_LOG_SYSLOG].state = QB_LOG_STATE_ENABLED; qb_list_add(&conf[QB_LOG_SYSLOG].active_list, &active_targets); + qb_log_callsites_register(__start___verbose, __stop___verbose); conf[QB_LOG_STDERR].state = QB_LOG_STATE_DISABLED; conf[QB_LOG_BLACKBOX].state = QB_LOG_STATE_DISABLED; @@ -281,14 +329,29 @@ void qb_log_init(const char *name, int32_t facility, int32_t priority) void qb_log_fini(void) { struct qb_log_target *t; + struct qb_log_filter *flt; + struct callsite_section *s; struct qb_list_head *iter; + struct qb_list_head *iter2; struct qb_list_head *next; + struct qb_list_head *next2; qb_log_thread_stop(); + qb_list_for_each_safe(iter, next, &callsite_sections) { + s = qb_list_entry(iter, struct callsite_section, list); + qb_list_del(iter); + free(s); + } qb_list_for_each_safe(iter, next, &active_targets) { t = qb_list_entry(iter, struct qb_log_target, active_list); _log_target_disable(t); + qb_list_for_each_safe(iter2, next2, &t->filter_head) { + flt = qb_list_entry(iter2, struct qb_log_filter, list); + qb_list_del(iter2); + free(flt->text); + free(flt); + } } } @@ -361,7 +424,7 @@ int32_t qb_log_ctl(uint32_t t, enum qb_log_conf c, int32_t arg) } switch (c) { case QB_LOG_CONF_ENABLED: - if (arg == QB_TRUE) { + if (arg) { rc = _log_target_enable(&conf[t]); } else { _log_target_disable(&conf[t]); diff --git a/lib/log_int.h b/lib/log_int.h index 15ea0de..16f1c21 100644 --- a/lib/log_int.h +++ b/lib/log_int.h @@ -62,7 +62,7 @@ struct qb_log_target { struct qb_log_filter { enum qb_log_filter_type type; - const char *text; + char *text; int32_t priority; struct qb_list_head list; }; -- 1.7.4

This finds all the callsites in shared libraries (using dl_iterate_phdr()) at the time qb_log_init() is called. Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt; Conflicts: lib/log.c --- configure.ac | 1 + include/qb/qblog.h | 6 +++++ lib/libqb.pc.in | 2 +- lib/log.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 74debbb..8366888 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,7 @@ esac # Checks for libraries. AC_CHECK_LIB([rt], [mq_open]) +AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_LIB([socket], [socket]) diff --git a/include/qb/qblog.h b/include/qb/qblog.h index a2facc1..e931652 100644 --- a/include/qb/qblog.h +++ b/include/qb/qblog.h @@ -203,6 +203,12 @@ struct qb_log_callsite { extern struct qb_log_callsite __start___verbose[]; extern struct qb_log_callsite __stop___verbose[]; +#define QB_LOG_INIT_DATA(name) \ + void name(void); \ + void name(void) { assert(__start___verbose != __stop___verbose); } \ + void __attribute__ ((constructor)) name(void); + + /** * Internal function: use qb_log() */ diff --git a/lib/libqb.pc.in b/lib/libqb.pc.in index 6d0963f..8426856 100644 --- a/lib/libqb.pc.in +++ b/lib/libqb.pc.in @@ -7,5 +7,5 @@ Name: libqb Version: @PACKAGE_VERSION@ Description: libqb Requires: -Libs: -L${libdir} -lqb -lrt +Libs: -L${libdir} -lqb -lrt -ldl Cflags: -I${includedir} diff --git a/lib/log.c b/lib/log.c index 0b01c0f..0a71717 100644 --- a/lib/log.c +++ b/lib/log.c @@ -20,7 +20,9 @@ */ #include "os_base.h" #include <ctype.h> +#include <link.h> #include <stdarg.h> + #include <qb/qbdefs.h> #include <qb/qblist.h> #include <qb/qblog.h> @@ -211,13 +213,21 @@ void qb_log_callsites_register(struct qb_log_callsite *_start, struct qb_log_cal if (_start == NULL || _stop == NULL) { return; } + + qb_list_for_each_entry(sect, &callsite_sections, list) { + if (sect->start == _start || sect->stop == _stop) { + return; + } + } + sect = calloc(1, sizeof(struct callsite_section)); sect->start = _start; sect->stop = _stop; qb_list_init(&sect->list); qb_list_add(&sect->list, &callsite_sections); - /* Now apply the filters on these new callsites + /* + * Now apply the filters on these new callsites */ qb_list_for_each_entry(t, &active_targets, active_list) { qb_list_for_each_entry(flt, &t->filter_head, list) { @@ -315,6 +325,46 @@ int32_t qb_log_filter_ctl(uint32_t t, enum qb_log_filter_conf c, return 0; } +static int32_t +_log_so_walk_callback(struct dl_phdr_info *info, size_t size, void *data) +{ + if (strlen(info->dlpi_name) > 0) { + void *handle; + void *start; + void *stop; + char *error; + + handle = dlopen(info->dlpi_name, RTLD_LAZY); + error = dlerror(); + if (!handle || error) { + qb_log(LOG_ERR, 0, "%s", error); + if(handle) { + dlclose(handle); + } + return 0; + } + + start = dlsym(handle, "__start___verbose"); + error = dlerror(); + if (error) { + goto done; + } + + stop = dlsym(handle, "__stop___verbose"); + error = dlerror(); + if (error) { + goto done; + + } else { + qb_log_callsites_register(start, stop); + } +done: + dlclose(handle); + } + + return 0; +} + void qb_log_init(const char *name, int32_t facility, int32_t priority) { int32_t i; @@ -331,7 +381,9 @@ void qb_log_init(const char *name, int32_t facility, int32_t priority) } conf[QB_LOG_SYSLOG].state = QB_LOG_STATE_ENABLED; qb_list_add(&conf[QB_LOG_SYSLOG].active_list, &active_targets); + qb_log_callsites_register(__start___verbose, __stop___verbose); + dl_iterate_phdr(_log_so_walk_callback, NULL); conf[QB_LOG_STDERR].state = QB_LOG_STATE_DISABLED; conf[QB_LOG_BLACKBOX].state = QB_LOG_STATE_DISABLED; -- 1.7.4

I think in most cases tags will not be used and it will just be a pain inserting ", 0". But if someone wants to use tags like this then they still can via qb_logt() Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt; --- include/qb/qblog.h | 48 +++++++++++++++++++++++++++++++++--------------- lib/log.c | 2 +- lib/log_blackbox.c | 2 +- lib/util_int.h | 4 ++-- tests/bench-log.c | 8 ++++---- tests/simple-log.c | 28 ++++++++++++++-------------- 6 files changed, 55 insertions(+), 37 deletions(-) diff --git a/include/qb/qblog.h b/include/qb/qblog.h index e931652..350b580 100644 --- a/include/qb/qblog.h +++ b/include/qb/qblog.h @@ -49,7 +49,7 @@ extern "C" { * main() { * qb_log_init("simple-log", LOG_DAEMON, LOG_INFO); * // ... - * qb_log(LOG_WARNING, 0, "watch out"); + * qb_log(LOG_WARNING, "watch out"); * // ... * qb_log_fini(); * } @@ -112,7 +112,7 @@ extern "C" { * // call this after you fork() * qb_log_thread_start(); * // ... - * qb_log(LOG_WARNING, 0, "watch out"); + * qb_log(LOG_WARNING, "watch out"); * // ... * qb_log_fini(); * } @@ -146,20 +146,22 @@ extern "C" { * qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_SIZE, 1024*10); * qb_log_ctl(QB_LOG_BLACKBOX, QB_LOG_CONF_ENABLED, QB_TRUE); * // ... - * qb_log(LOG_WARNING, 0, "watch out"); + * qb_log(LOG_WARNING, "watch out"); * // ... * qb_log_fini(); * } * @endcode * * @par Tagging messages. - * You can tag messages (again a bit field) using the second argument - * to qb_log(). this can be used to add feature or sub-system information - * to the logs. + * You can tag messages using the second argument to qb_logt() or + * by using qb_log_filter_ctl(). + * This can be used to add feature or sub-system information to the logs. * * @code * const char* my_tags_stringify(uint32_t tags) { - * if (qb_bit_is_set(tags, 3) { + * if (qb_bit_is_set(tags, QB_LOG_TAG_LIBQB_MSG_BIT) { + * return "libqb"; + * } else if (tags == 3) { * return "three"; * } else { * return "MAIN"; @@ -170,12 +172,13 @@ extern "C" { * qb_log_tags_stringify_fn_set(my_tags_stringify); * qb_log_format_set(QB_LOG_STDERR, "[%5g] %p %b"); * // ... - * qb_log(LOG_INFO, (1<<3), "hello"); - * qb_log(LOG_INFO, 0, "hello"); + * qb_logt(LOG_INFO, 3, "hello"); + * qb_logt(LOG_INFO, 0, "hello"); * } * @endcode * The code above will produce: * @code + * [libqb] some message * [three] info hello * [MAIN ] info hello * @endcode @@ -210,7 +213,7 @@ extern struct qb_log_callsite __stop___verbose[]; /** - * Internal function: use qb_log() + * Internal function: use qb_log() or qb_logt() */ void qb_log_real_(struct qb_log_callsite *cs, ...); @@ -246,10 +249,11 @@ void qb_log_from_external_source(const char *function, /** - * This is the main function to generate a log message. + * This is the function to generate a log message if you want to + * manually add tags. * * @param priority this takes syslog priorities. - * @param tags this is a bit field that you can use with + * @param tags this is a uint32_t that you can use with * qb_log_tags_stringify_fn_set() to "tag" a log message * with a feature or sub-system then you can use "%g" * in the format specifer to print it out. @@ -257,16 +261,30 @@ void qb_log_from_external_source(const char *function, * @param args usual printf style args */ #ifndef S_SPLINT_S -#define qb_log(priority, tags, fmt, args...) do { \ +#define qb_logt(priority, tags, fmt, args...) do { \ static struct qb_log_callsite descriptor \ __attribute__((section("__verbose"), aligned(8))) = \ { __func__, __FILE__, fmt, priority, __LINE__, 0, tags }; \ qb_log_real_(&descriptor, ##args); \ } while(0) #else +#define qb_logt +#endif + +/** + * This is the main function to generate a log message. + * + * @param priority this takes syslog priorities. + * @param fmt usual printf style format specifiers + * @param args usual printf style args + */ +#ifndef S_SPLINT_S +#define qb_log(priority, fmt, args...) qb_logt(priority, 0, fmt, ##args) +#else #define qb_log #endif + /** * This is similar to perror except it goes into the logging system. * @@ -276,9 +294,9 @@ void qb_log_from_external_source(const char *function, * @param args usual printf style args */ #ifndef S_SPLINT_S -#define qb_perror(priority, tags, fmt, args...) do { \ +#define qb_perror(priority, fmt, args...) do { \ const char *err = strerror(errno); \ - qb_log(priority, tags, fmt ": %s (%d)", ##args, err, errno); \ + qb_logt(priority, 0, fmt ": %s (%d)", ##args, err, errno); \ } while(0) #else #define qb_perror diff --git a/lib/log.c b/lib/log.c index 89f4cf4..5aa04ce 100644 --- a/lib/log.c +++ b/lib/log.c @@ -337,7 +337,7 @@ _log_so_walk_callback(struct dl_phdr_info *info, size_t size, void *data) handle = dlopen(info->dlpi_name, RTLD_LAZY); error = dlerror(); if (!handle || error) { - qb_log(LOG_ERR, 0, "%s", error); + qb_log(LOG_ERR, "%s", error); if(handle) { dlclose(handle); } diff --git a/lib/log_blackbox.c b/lib/log_blackbox.c index 2bc8d01..2e50afe 100644 --- a/lib/log_blackbox.c +++ b/lib/log_blackbox.c @@ -136,7 +136,7 @@ void qb_log_blackbox_print_from_file(const char *bb_filename) fd = open(bb_filename, O_CREAT | O_RDWR, 0700); if (fd < 0) { - qb_perror(LOG_ERR, 0, "qb_log_blackbox_print_from_file"); + qb_perror(LOG_ERR, "qb_log_blackbox_print_from_file"); return; } instance = qb_rb_create_from_file(fd, 0); diff --git a/lib/util_int.h b/lib/util_int.h index 88e528d..0a3f1ff 100644 --- a/lib/util_int.h +++ b/lib/util_int.h @@ -29,7 +29,7 @@ * destinguished from external ones. */ #ifndef S_SPLINT_S -#define qb_util_log(priority, fmt, args...) qb_log(priority, QB_LOG_TAG_LIBQB_MSG, fmt, ##args) +#define qb_util_log(priority, fmt, args...) qb_logt(priority, QB_LOG_TAG_LIBQB_MSG, fmt, ##args) #else #define qb_util_log #endif @@ -37,7 +37,7 @@ #ifndef S_SPLINT_S #define qb_util_perror(priority, fmt, args...) do { \ const char *err = strerror(errno); \ - qb_log(priority, QB_LOG_TAG_LIBQB_MSG, fmt ": %s (%d)", ##args, err, errno); \ + qb_logt(priority, QB_LOG_TAG_LIBQB_MSG, fmt ": %s (%d)", ##args, err, errno); \ } while(0) #else #define qb_util_perror diff --git a/tests/bench-log.c b/tests/bench-log.c index 48d641c..9351431 100644 --- a/tests/bench-log.c +++ b/tests/bench-log.c @@ -91,21 +91,21 @@ int main (void) printf ("heating up cache with qb_log functionality\n"); for (i = 0; i < ITERATIONS; i++) { - qb_log(LOG_DEBUG, 0, "hello"); + qb_log(LOG_DEBUG, "hello"); } bm_start(); for (i = 0; i < ITERATIONS; i++) { - qb_log(LOG_DEBUG, 0, "RecordA"); + qb_log(LOG_DEBUG, "RecordA"); } bm_finish ("qb_log 1 arguments:"); bm_start(); for (i = 0; i < ITERATIONS; i++) { - qb_log(LOG_DEBUG, 0, "%s%s", "RecordA", "RecordB"); + qb_log(LOG_DEBUG, "%s%s", "RecordA", "RecordB"); } bm_finish ("qb_log 2 arguments:"); bm_start(); for (i = 0; i < ITERATIONS; i++) { - qb_log(LOG_DEBUG, 0, "%s%s%s", "RecordA", "RecordB", "RecordC"); + qb_log(LOG_DEBUG, "%s%s%s", "RecordA", "RecordB", "RecordC"); } bm_finish ("qb_log 3 arguments:"); diff --git a/tests/simple-log.c b/tests/simple-log.c index 0e10204..e507e0f 100644 --- a/tests/simple-log.c +++ b/tests/simple-log.c @@ -31,22 +31,22 @@ static void func_one(void) { FILE* fd; - qb_log(LOG_DEBUG, MY_TAG_TWO, "arf arf?"); - qb_log(LOG_CRIT, MY_TAG_THREE, "arrrg!"); - qb_log(LOG_ERR, MY_TAG_THREE, "oops, I did it again"); - qb_log(LOG_INFO, 0, "are you aware ..."); + qb_logt(LOG_DEBUG, MY_TAG_TWO, "arf arf?"); + qb_logt(LOG_CRIT, MY_TAG_THREE, "arrrg!"); + qb_logt(LOG_ERR, MY_TAG_THREE, "oops, I did it again"); + qb_log(LOG_INFO, "are you aware ..."); fd = fopen("/nothing.txt", "r+"); if (fd == NULL) { - qb_perror(LOG_ERR, 0, "can't open(\"/nothing.txt\")"); + qb_perror(LOG_ERR, "can't open(\"/nothing.txt\")"); } } static void func_two(void) { - qb_log(LOG_DEBUG, 0, "arf arf?"); - qb_log(LOG_CRIT, MY_TAG_ONE, "arrrg!"); - qb_log(LOG_ERR, 0, "oops, I did it again"); - qb_log(LOG_INFO, MY_TAG_THREE, "are you aware ..."); + qb_logt(LOG_DEBUG, 0, "arf arf?"); + qb_logt(LOG_CRIT, MY_TAG_ONE, "arrrg!"); + qb_log(LOG_ERR, "oops, I did it again"); + qb_logt(LOG_INFO, MY_TAG_THREE, "are you aware ..."); } static void show_usage(const char *name) @@ -167,16 +167,16 @@ int32_t main(int32_t argc, char *argv[]) if (do_threaded) { qb_log_thread_start(); } - qb_log(LOG_DEBUG, 0, "hello"); - qb_log(LOG_INFO, 0, "this is an info"); - qb_log(LOG_NOTICE, 0, "hello - notice?"); + qb_log(LOG_DEBUG, "hello"); + qb_log(LOG_INFO, "this is an info"); + qb_log(LOG_NOTICE, "hello - notice?"); func_one(); func_two(); qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_ENABLED, QB_FALSE); - qb_log(LOG_WARNING, 0, "no syslog"); - qb_log(LOG_ERR, 0, "no syslog"); + qb_log(LOG_WARNING, "no syslog"); + qb_log(LOG_ERR, "no syslog"); #if 0 // test blackbox -- 1.7.4