X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Flog.c;h=38ecac7ef6f4a7962cd29828e4e3701cdae29500;hp=6b82bcdcf85665f971f1952665de956ebc3fb6ef;hb=05193e78a2553c93a61da19a39e1276b1a509bac;hpb=7cc2958d8f7877fa54a120cbc218ece03a8c0bcf diff --git a/src/log.c b/src/log.c index 6b82bcd..38ecac7 100644 --- a/src/log.c +++ b/src/log.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ @@ -22,21 +22,34 @@ #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; enum l_file_type { use_stderr, use_none, use_file }; -static enum l_file_type yaz_file_type = use_stderr; -static FILE *yaz_global_log_file = NULL; + +struct { + enum l_file_type type; + FILE *log_file; + char l_prefix[512]; + char l_prefix2[512]; + char l_fname[512]; +} yaz_log_info = { + use_stderr, 0, "", "", "" +}; static void (*start_hook_func)(int, const char *, void *) = NULL; static void *start_hook_info; @@ -47,14 +60,10 @@ static void *end_hook_info; static void (*hook_func)(int, const char *, void *) = NULL; static void *hook_info; -static char l_prefix[512] = ""; -static char l_prefix2[512] = ""; -static char l_fname[512] = ""; - - static char l_old_default_format[] = "%H:%M:%S-%d/%m"; static char l_new_default_format[] = "%Y%m%d-%H%M%S"; #define TIMEFORMAT_LEN 50 +#define TID_LEN 30 static char l_custom_format[TIMEFORMAT_LEN] = ""; static char *l_actual_format = l_old_default_format; @@ -79,20 +88,33 @@ static struct { { YLOG_LOG, "log" }, { YLOG_ERRNO, ""}, { YLOG_MALLOC, "malloc"}, - { YLOG_APP, "app" }, + { 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 YAZ_MUTEX log_mutex = 0; + +static void yaz_log_lock(void) +{ + yaz_mutex_enter(log_mutex); +} + +static void yaz_log_unlock(void) +{ + yaz_mutex_leave(log_mutex); +} + static void internal_log_init(void) { static int mutex_init_flag = 0; /* not yet initialized */ @@ -102,6 +124,11 @@ static void internal_log_init(void) return; mutex_init_flag = 1; /* here, 'cause nmem_mutex_create may call yaz_log */ + 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); @@ -111,21 +138,21 @@ static void internal_log_init(void) FILE *yaz_log_file(void) { FILE *f = 0; - switch(yaz_file_type) + switch (yaz_log_info.type) { case use_stderr: f = stderr; break; case use_none: f = 0; break; - case use_file: f = yaz_global_log_file; break; + case use_file: f = yaz_log_info.log_file; break; } return f; } void yaz_log_close(void) { - if (yaz_file_type == use_file && yaz_global_log_file) + if (yaz_log_info.type == use_file && yaz_log_info.log_file) { - fclose(yaz_global_log_file); - yaz_global_log_file = 0; + fclose(yaz_log_info.log_file); + yaz_log_info.log_file = 0; } } @@ -137,16 +164,16 @@ void yaz_log_init_file(const char *fname) if (fname) { if (*fname == '\0') - yaz_file_type = use_stderr; /* empty name; use stderr */ + yaz_log_info.type = use_stderr; /* empty name; use stderr */ else - yaz_file_type = use_file; - strncpy(l_fname, fname, sizeof(l_fname)-1); - l_fname[sizeof(l_fname)-1] = '\0'; + yaz_log_info.type = use_file; + strncpy(yaz_log_info.l_fname, fname, sizeof(yaz_log_info.l_fname)-1); + yaz_log_info.l_fname[sizeof(yaz_log_info.l_fname)-1] = '\0'; } else { - yaz_file_type = use_none; /* NULL name; use no file at all */ - l_fname[0] = '\0'; + yaz_log_info.type = use_none; /* NULL name; use no file at all */ + yaz_log_info.l_fname[0] = '\0'; } yaz_log_reopen(); } @@ -196,7 +223,7 @@ void yaz_log_init_level(int level) { l_level = level; yaz_log_reopen(); /* make sure we set buffering right */ - } + } else l_level = level; @@ -227,17 +254,19 @@ void yaz_log_init_level(int level) void yaz_log_init_prefix(const char *prefix) { if (prefix && *prefix) - yaz_snprintf(l_prefix, sizeof(l_prefix), "%s ", prefix); + yaz_snprintf(yaz_log_info.l_prefix, + sizeof(yaz_log_info.l_prefix), "%s ", prefix); else - *l_prefix = 0; + *yaz_log_info.l_prefix = 0; } void yaz_log_init_prefix2(const char *prefix) { if (prefix && *prefix) - yaz_snprintf(l_prefix2, sizeof(l_prefix2), "%s ", prefix); + yaz_snprintf(yaz_log_info.l_prefix2, + sizeof(yaz_log_info.l_prefix2), "%s ", prefix); else - *l_prefix2 = 0; + *yaz_log_info.l_prefix2 = 0; } void yaz_log_init(int level, const char *prefix, const char *fname) @@ -280,12 +309,13 @@ static void yaz_log_open_check(struct tm *tm, int force, const char *filemode) char new_filename[512]; static char cur_filename[512] = ""; - if (yaz_file_type != use_file) + if (yaz_log_info.type != use_file) return; - if (*l_fname) + if (*yaz_log_info.l_fname) { - strftime(new_filename, sizeof(new_filename)-1, l_fname, tm); + strftime(new_filename, sizeof(new_filename)-1, yaz_log_info.l_fname, + tm); if (strcmp(new_filename, cur_filename)) { strcpy(cur_filename, new_filename); @@ -293,9 +323,9 @@ static void yaz_log_open_check(struct tm *tm, int force, const char *filemode) } } - if (l_max_size > 0 && yaz_global_log_file) + if (l_max_size > 0 && yaz_log_info.log_file) { - long flen = ftell(yaz_global_log_file); + long flen = ftell(yaz_log_info.log_file); if (flen > l_max_size) { rotate_log(cur_filename); @@ -312,9 +342,9 @@ static void yaz_log_open_check(struct tm *tm, int force, const char *filemode) if (new_file) { yaz_log_close(); - yaz_global_log_file = new_file; + yaz_log_info.log_file = new_file; if (l_level & YLOG_FLUSH) - setvbuf(yaz_global_log_file, 0, _IONBF, 0); + setvbuf(yaz_log_info.log_file, 0, _IONBF, 0); } else { @@ -333,12 +363,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(); } @@ -357,7 +389,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; @@ -370,29 +402,31 @@ static void yaz_log_to_file(int level, const char *log_message) 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) { char tbuf[TIMEFORMAT_LEN]; + 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, "["); @@ -402,7 +436,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)) { @@ -411,11 +445,22 @@ static void yaz_log_to_file(int level, const char *log_message) } if (tbuf[0]) strcat(tbuf, " "); - fprintf(file, "%s%s%s %s%s\n", tbuf, l_prefix, flags, l_prefix2, + tid[0] = '\0'; + + if (l_level & YLOG_TID) + { + yaz_thread_id_cstr(tid, sizeof(tid)-1); + if (tid[0]) + strcat(tid, " "); + } + + fprintf(file, "%s%s%s%s %s%s\n", tbuf, yaz_log_info.l_prefix, + tid, flags, yaz_log_info.l_prefix2, log_message); if (l_level & YLOG_FLUSH) fflush(file); } + yaz_log_unlock(); } void yaz_log(int level, const char *fmt, ...) @@ -459,15 +504,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); @@ -481,7 +526,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, '/'))) @@ -520,16 +565,16 @@ int yaz_log_module_level(const char *name) char clean[255]; char *n = clean_name(name, strlen(name), clean, sizeof(clean)); internal_log_init(); - + 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; } @@ -555,11 +600,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));