X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flog.c;h=b439c4cd55933d242d6d934ce7ce529bdf1676bb;hp=b68e308412b53a6e30ae91a2be7844fba526c598;hb=44d6b0193b4c993f23e081fa865cb0bf81b21272;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/log.c b/src/log.c index b68e308..b439c4c 100644 --- a/src/log.c +++ b/src/log.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ @@ -22,16 +22,20 @@ #endif #include #include -#include #include #include #include #include +#include #include #include #include +#include #include #include +#if YAZ_POSIX_THREADS +#include +#endif static int l_level = YLOG_DEFAULT_LEVEL; @@ -87,33 +91,44 @@ static struct { { YLOG_TID, "tid" }, { YLOG_APP, "app" }, { YLOG_NOTIME, "notime" }, - { YLOG_APP2, "app2" }, + { YLOG_APP2, "app2" }, { YLOG_APP3, "app3" }, { YLOG_ALL, "all" }, { YLOG_FLUSH, "flush" }, - { YLOG_LOGLVL, "loglevel" }, + { YLOG_LOGLVL, "loglevel" }, { 0, "none" }, { 0, NULL } /* the rest will be filled in if the user defines dynamic modules*/ -}; +}; static unsigned int next_log_bit = YLOG_LAST_BIT<<1; /* first dynamic bit */ -static void internal_log_init(void) +static YAZ_MUTEX log_mutex = 0; + +static void yaz_log_lock(void) { - static int mutex_init_flag = 0; /* not yet initialized */ - char *env; + yaz_mutex_enter(log_mutex); +} - if (mutex_init_flag) - return; - mutex_init_flag = 1; /* here, 'cause nmem_mutex_create may call yaz_log */ +static void yaz_log_unlock(void) +{ + yaz_mutex_leave(log_mutex); +} + +void yaz_log_init_globals(void) +{ + char *env; + if (log_mutex == 0) + yaz_mutex_create(&log_mutex); +#if YAZ_POSIX_THREADS + pthread_atfork(yaz_log_lock, yaz_log_unlock, yaz_log_unlock); +#endif env = getenv("YAZ_LOG"); if (env) l_level = yaz_log_mask_str_x(env, l_level); } - FILE *yaz_log_file(void) { FILE *f = 0; @@ -137,7 +152,7 @@ void yaz_log_close(void) void yaz_log_init_file(const char *fname) { - internal_log_init(); + yaz_init_globals(); yaz_log_close(); if (fname) @@ -152,7 +167,7 @@ void yaz_log_init_file(const char *fname) else { yaz_log_info.type = use_none; /* NULL name; use no file at all */ - yaz_log_info.l_fname[0] = '\0'; + yaz_log_info.l_fname[0] = '\0'; } yaz_log_reopen(); } @@ -197,12 +212,12 @@ static void rotate_log(const char *cur_fname) void yaz_log_init_level(int level) { - internal_log_init(); + yaz_init_globals(); if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) ) { l_level = level; yaz_log_reopen(); /* make sure we set buffering right */ - } + } else l_level = level; @@ -250,7 +265,7 @@ void yaz_log_init_prefix2(const char *prefix) void yaz_log_init(int level, const char *prefix, const char *fname) { - internal_log_init(); + yaz_init_globals(); yaz_log_init_level(level); yaz_log_init_prefix(prefix); if (fname && *fname) @@ -342,12 +357,14 @@ static void yaz_log_do_reopen(const char *filemode) struct tm *tm; #endif + yaz_log_lock(); #if HAVE_LOCALTIME_R localtime_r(&cur_time, tm); #else tm = localtime(&cur_time); #endif yaz_log_open_check(tm, 1, filemode); + yaz_log_unlock(); } @@ -366,7 +383,7 @@ static void yaz_strftime(char *dst, size_t sz, { strftime(dst, sz, fmt, tm); } - + static void yaz_log_to_file(int level, const char *log_message) { FILE *file; @@ -377,15 +394,14 @@ static void yaz_log_to_file(int level, const char *log_message) struct tm *tm; #endif - internal_log_init(); - + yaz_log_lock(); #if HAVE_LOCALTIME_R localtime_r(&ti, tm); #else tm = localtime(&ti); #endif - - yaz_log_open_check(tm, 0, "a"); + + yaz_log_open_check(tm, 0, "a"); file = yaz_log_file(); /* file may change in yaz_log_open_check */ if (file) @@ -394,15 +410,15 @@ static void yaz_log_to_file(int level, const char *log_message) char tid[TID_LEN]; char flags[1024]; int i; - + *flags = '\0'; for (i = 0; level && mask_names[i].name; i++) if ( mask_names[i].mask & level) { - if (*mask_names[i].name && mask_names[i].mask && + if (*mask_names[i].name && mask_names[i].mask && mask_names[i].mask != YLOG_ALL) { - if (strlen(flags) + strlen(mask_names[i].name) + if (strlen(flags) + strlen(mask_names[i].name) < sizeof(flags) - 4) { strcat(flags, "["); @@ -412,7 +428,7 @@ static void yaz_log_to_file(int level, const char *log_message) level &= ~mask_names[i].mask; } } - + tbuf[0] = '\0'; if (!(l_level & YLOG_NOTIME)) { @@ -436,6 +452,7 @@ static void yaz_log_to_file(int level, const char *log_message) if (l_level & YLOG_FLUSH) fflush(file); } + yaz_log_unlock(); } void yaz_log(int level, const char *fmt, ...) @@ -445,7 +462,7 @@ void yaz_log(int level, const char *fmt, ...) FILE *file; int o_level = level; - internal_log_init(); + yaz_init_globals(); if (!(level & l_level)) return; va_start(ap, fmt); @@ -479,15 +496,15 @@ void yaz_log(int level, const char *fmt, ...) void yaz_log_time_format(const char *fmt) { - if ( !fmt || !*fmt) + if ( !fmt || !*fmt) { /* no format, default to new */ l_actual_format = l_new_default_format; - return; + return; } if (0==strcmp(fmt, "old")) { /* force the old format */ l_actual_format = l_old_default_format; - return; + return; } /* else use custom format */ strncpy(l_custom_format, fmt, TIMEFORMAT_LEN-1); @@ -501,7 +518,7 @@ static char *clean_name(const char *name, size_t len, char *namebuf, size_t bufl char *p = namebuf; char *start = namebuf; if (buflen <= len) - len = buflen-1; + len = buflen-1; strncpy(namebuf, name, len); namebuf[len] = '\0'; while ((p = strchr(start, '/'))) @@ -539,32 +556,33 @@ int yaz_log_module_level(const char *name) int i; char clean[255]; char *n = clean_name(name, strlen(name), clean, sizeof(clean)); - internal_log_init(); - + yaz_init_globals(); + for (i = 0; mask_names[i].name; i++) if (0==strcmp(n, mask_names[i].name)) { yaz_log(YLOG_LOGLVL, "returning log bit 0x%x for '%s' %s", - mask_names[i].mask, n, + mask_names[i].mask, n, strcmp(n,name) ? name : ""); return mask_names[i].mask; } - yaz_log(YLOG_LOGLVL, "returning NO log bit for '%s' %s", n, + yaz_log(YLOG_LOGLVL, "returning NO log bit for '%s' %s", n, strcmp(n, name) ? name : "" ); return 0; } int yaz_log_mask_str(const char *str) { - internal_log_init(); /* since l_level may be affected */ + yaz_init_globals(); /* since l_level may be affected */ return yaz_log_mask_str_x(str, l_level); } +/* this function is called by yaz_log_init_globals & yaz_init_globals + and, thus, may not call any of them indirectly */ int yaz_log_mask_str_x(const char *str, int level) { const char *p; - internal_log_init(); while (*str) { int negated = 0; @@ -575,11 +593,11 @@ int yaz_log_mask_str_x(const char *str, int level) negated = 1; str++; } - if (isdigit(*(unsigned char *) str)) + if (yaz_isdigit(*str)) { level = atoi(str); } - else + else { char clean[509]; char *n = clean_name(str, (size_t) (p - str), clean, sizeof(clean));