/*
- * Copyright (c) 1995-2004, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: log.c,v 1.20 2005-01-07 10:28:28 heikki Exp $
+ * $Id: log.c,v 1.26 2005-09-09 10:33:45 adam Exp $
*/
/**
static struct {
int mask;
char *name;
-} mask_names[MAX_MASK_NAMES] =
+} mask_names[MAX_MASK_NAMES] =
{
{ YLOG_FATAL, "fatal"},
{ YLOG_DEBUG, "debug"},
{ YLOG_LOG, "log" },
{ YLOG_ERRNO, ""},
{ YLOG_MALLOC, "malloc"},
- /* { YLOG_APP, "app" }, */
+ { YLOG_APP, "app" },
{ YLOG_NOTIME, "notime" },
- /* { YLOG_APP2, "app2" }, */
- /* { YLOG_APP3, "app3" }, */
+ { YLOG_APP2, "app2" },
+ { YLOG_APP3, "app3" },
{ YLOG_ALL, "all" },
{ YLOG_FLUSH, "flush" },
{ YLOG_LOGLVL, "loglevel" },
- { 0, "none" },
+ { 0, "none" },
{ 0, NULL }
/* the rest will be filled in if the user defines dynamic modules*/
};
void yaz_log_init_file (const char *fname)
{
- if (!mutex_init_flag)
- init_mutex();
+ init_mutex();
if (fname)
{
- strncpy(l_fname, fname, sizeof(l_fname)-1);
- l_fname[sizeof(l_fname)-1] = '\0';
+ strncpy(l_fname, fname, sizeof(l_fname)-1);
+ l_fname[sizeof(l_fname)-1] = '\0';
}
else
- l_fname[0] = '\0';
+ l_fname[0] = '\0';
yaz_log_reopen();
}
void yaz_log_reopen(void)
{
FILE *new_file;
- if (!mutex_init_flag)
- init_mutex();
+ init_mutex();
if (!l_file)
l_file = stderr;
if (!*l_fname)
- new_file = stderr;
+ new_file = stderr;
else if (!(new_file = fopen(l_fname, "a")))
{
new_file=l_file;
void yaz_log_init_level (int level)
{
+ init_mutex();
if ( (l_level & YLOG_FLUSH) != (level & YLOG_FLUSH) )
{
l_level = level;
l_level = level;
if (l_level & YLOG_LOGLVL)
{ /* dump the log level bits */
- char *bittype="Static ";
- int i;
- yaz_log(YLOG_LOGLVL,"Setting log level to %d = 0x%08x",l_level,l_level);
- for (i = 0; mask_names[i].name; i++)
+ const char *bittype = "Static ";
+ int i, sz;
+
+ yaz_log(YLOG_LOGLVL, "Setting log level to %d = 0x%08x",
+ l_level, l_level);
+ /* determine size of mask_names (locked) */
+ nmem_mutex_enter(log_mutex);
+ for (sz = 0; mask_names[sz].name; sz++)
+ ;
+ nmem_mutex_leave(log_mutex);
+ /* second pass without lock */
+ for (i = 0; i < sz; i++)
if (mask_names[i].mask && *mask_names[i].name)
- if (strcmp(mask_names[i].name,"all")!=0)
+ if (strcmp(mask_names[i].name, "all") != 0)
{
- yaz_log(YLOG_LOGLVL,"%s log bit %08x '%s' is %s",
- bittype, mask_names[i].mask, mask_names[i].name,
- (level & mask_names[i].mask)? "ON": "off");
- if (mask_names[i].mask>YLOG_LAST_BIT)
- bittype="Dynamic";
+ yaz_log(YLOG_LOGLVL, "%s log bit %08x '%s' is %s",
+ bittype, mask_names[i].mask, mask_names[i].name,
+ (level & mask_names[i].mask)? "ON": "off");
+ if (mask_names[i].mask > YLOG_LAST_BIT)
+ bittype = "Dynamic";
}
}
}
void yaz_log_init_prefix (const char *prefix)
{
if (prefix && *prefix)
- sprintf(l_prefix, "%.511s ", prefix);
+ sprintf(l_prefix, "%.511s ", prefix);
else
*l_prefix = 0;
}
void yaz_log_init_prefix2 (const char *prefix)
{
if (prefix && *prefix)
- sprintf(l_prefix2, "%.511s ", prefix);
+ sprintf(l_prefix2, "%.511s ", prefix);
else
*l_prefix2 = 0;
}
void yaz_log_init(int level, const char *prefix, const char *fname)
{
- if (!mutex_init_flag)
- init_mutex();
+ init_mutex();
yaz_log_init_level (level);
yaz_log_init_prefix (prefix);
if (fname && *fname)
int flen;
if (!(level & l_level))
- return;
- if (!mutex_init_flag)
- init_mutex();
+ return;
+ init_mutex();
+ nmem_mutex_enter(log_mutex);
if (!l_file)
l_file = stderr;
if ((l_file != stderr) && (l_max_size>0))
{
- nmem_mutex_enter (log_mutex);
flen = ftell(l_file);
if (flen>l_max_size)
rotate_log();
- nmem_mutex_leave (log_mutex);
}
*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].mask & level)
+ {
+ if (*mask_names[i].name && mask_names[i].mask &&
mask_names[i].mask != YLOG_ALL)
{
- sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
- level &= ~mask_names[i].mask;
+ sprintf(flags + strlen(flags), "[%s]", mask_names[i].name);
+ level &= ~mask_names[i].mask;
}
- }
+ }
+
va_start(ap, fmt);
#ifdef WIN32
_vsnprintf(buf, sizeof(buf)-1, fmt, ap);
ti = time(0);
tim = localtime(&ti);
if (l_level & YLOG_NOTIME)
- tbuf[0] = '\0';
+ tbuf[0] = '\0';
else
- strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim);
+ strftime(tbuf, TIMEFORMAT_LEN-1, l_actual_format, tim);
tbuf[TIMEFORMAT_LEN-1] = '\0';
fprintf(l_file, "%s %s%s %s%s\n", tbuf, l_prefix, flags,
l_prefix2, buf);
if (l_level & (YLOG_FLUSH|YLOG_DEBUG) )
fflush(l_file);
if (end_hook_func)
- (*end_hook_func)(o_level, buf, end_hook_info);
+ (*end_hook_func)(o_level, buf, end_hook_info);
+ nmem_mutex_leave(log_mutex);
}
void yaz_log_time_format(const char *fmt)
{
char *p = namebuf;
char *start = namebuf;
- if (buflen <len)
- len = buflen;
+ if (buflen <= len)
+ len = buflen-1;
strncpy(namebuf, name, len);
namebuf[len] = '\0';
while ((p = strchr(start,'/')))
if ((p = strrchr(start,'.')))
*p = '\0';
return start;
-
}
static int define_module_bit(const char *name)
{
int i;
+ init_mutex();
+ nmem_mutex_enter(log_mutex);
for (i = 0; mask_names[i].name; i++)
- ;
+ if (0 == strcmp(mask_names[i].name, name))
+ {
+ nmem_mutex_leave(log_mutex);
+ return mask_names[i].mask;
+ }
if ( (i>=MAX_MASK_NAMES) || (next_log_bit >= 1<<31 ))
{
- yaz_log(YLOG_WARN,"No more log bits left, not logging '%s'", name);
+ nmem_mutex_leave(log_mutex);
+ yaz_log(YLOG_WARN, "No more log bits left, not logging '%s'", name);
return 0;
}
mask_names[i].mask = next_log_bit;
next_log_bit = next_log_bit<<1;
- mask_names[i].name = xstrdup(name);
+ mask_names[i].name = malloc (strlen(name)+1);
+ strcpy(mask_names[i].name, name);
mask_names[i+1].name = NULL;
mask_names[i+1].mask = 0;
+ nmem_mutex_leave(log_mutex);
return mask_names[i].mask;
}
int i;
char clean[255];
char *n = clean_name(name, strlen(name), clean, sizeof(clean));
+ init_mutex();
+
+ nmem_mutex_enter(log_mutex);
for (i = 0; mask_names[i].name; i++)
- if (0==strcmp(n,mask_names[i].name))
+ if (0==strcmp(n, mask_names[i].name))
{
- yaz_log(YLOG_LOGLVL,"returning log bit 0x%x for '%s' %s",
+ nmem_mutex_leave(log_mutex);
+ yaz_log(YLOG_LOGLVL, "returning log bit 0x%x for '%s' %s",
mask_names[i].mask, n,
- strcmp(n,name)?name:"" );
+ strcmp(n,name) ? name : "");
return mask_names[i].mask;
}
- yaz_log(YLOG_LOGLVL,"returning NO log bit for '%s' %s", n,
- strcmp(n,name)?name:"" );
+ nmem_mutex_leave(log_mutex);
+ yaz_log(YLOG_LOGLVL, "returning NO log bit for '%s' %s", n,
+ strcmp(n, name) ? name : "" );
return 0;
}
int yaz_log_mask_str_x (const char *str, int level)
{
const char *p;
- int i;
- char clean[255] = "";
- char *n = clean;
while (*str)
{
- int found = 0;
int negated = 0;
for (p = str; *p && *p != ','; p++)
;
if (*str=='-')
{
- negated=1;
+ negated = 1;
str++;
}
if (isdigit(*(unsigned char *) str))
{
- level = atoi (str);
- found = 1;
+ level = atoi(str);
}
else
{
- n = clean_name(str, p-str, clean, sizeof(clean));
- for (i = 0; mask_names[i].name; i++)
- if (0==strcmp (mask_names[i].name,n))
- {
- if (mask_names[i].mask)
- if (negated)
- level &= ~mask_names[i].mask;
- else
- level |= mask_names[i].mask;
- else
- level = 0; /* 'none' clears them all */
- found = 1;
- }
+ char clean[509];
+ char *n = clean_name(str, p-str, clean, sizeof(clean));
+ int mask = define_module_bit(n);
+ if (!mask)
+ level = 0; /* 'none' clears them all */
+ else if (negated)
+ level &= ~mask;
+ else
+ level |= mask;
}
- if (!found)
- level |= define_module_bit(n);
if (*p == ',')
p++;
str = p;
}
return level;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yaz-moved-to-github.git / blobdiff