#include <yaz/mutex.h>
#include <yaz/snprintf.h>
#include <yaz/xmalloc.h>
+#if YAZ_POSIX_THREADS
+#include <pthread.h>
+#endif
static int l_level = YLOG_DEFAULT_LEVEL;
static YAZ_MUTEX log_mutex = 0;
-void yaz_log_lock(void)
+static void yaz_log_lock(void)
{
yaz_mutex_enter(log_mutex);
}
-void yaz_log_unlock(void)
+static void yaz_log_unlock(void)
{
yaz_mutex_leave(log_mutex);
}
-static void internal_log_init(void)
+void yaz_log_init_globals(void)
{
- static int mutex_init_flag = 0; /* not yet initialized */
char *env;
- if (mutex_init_flag)
- 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);
}
-
FILE *yaz_log_file(void)
{
FILE *f = 0;
void yaz_log_init_file(const char *fname)
{
- internal_log_init();
+ yaz_init_globals();
yaz_log_close();
if (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;
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)
#ifdef WIN32
yaz_log_close();
#endif
- new_file = fopen(cur_filename, filemode);
+ if (!strncmp(cur_filename, "fd=", 3))
+ new_file = fdopen(atoi(cur_filename + 3), filemode);
+ else
+ new_file = fopen(cur_filename, filemode);
if (new_file)
{
yaz_log_close();
struct tm *tm;
#endif
- internal_log_init();
-
yaz_log_lock();
#if HAVE_LOCALTIME_R
localtime_r(&ti, tm);
FILE *file;
int o_level = level;
- internal_log_init();
+ yaz_init_globals();
if (!(level & l_level))
return;
va_start(ap, fmt);
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))
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;