/*
- * Sherlock Library -- Logging
+ * UCW Library -- Logging
*
- * (c) 1997--2002 Martin Mares <mj@ucw.cz>
+ * (c) 1997--2006 Martin Mares <mj@ucw.cz>
*
* This software may be freely distributed and used according to the terms
* of the GNU Lesser General Public License.
#include <stdio.h>
#include <stdlib.h>
-#include <stdarg.h>
#include <string.h>
-#include <fcntl.h>
#include <unistd.h>
+#include <sys/time.h>
#include <time.h>
#include <alloca.h>
-static char log_progname[32], *log_name_patt, *log_name;
+static char log_progname[32];
+char *log_filename;
char *log_title;
-static int log_pid;
-static int log_params;
-static int log_name_size;
-int log_switch_nest;
-
-void
-log_fork(void)
-{
- log_pid = getpid();
-}
-
-static void
-do_log_switch(struct tm *tm)
-{
- int fd, l;
- char name[log_name_size];
-
- if (!log_name_patt ||
- log_name[0] && !log_params)
- return;
- log_switch_nest++;
- l = strftime(name, log_name_size, log_name_patt, tm);
- if (l < 0 || l >= log_name_size)
- die("Error formatting log file name: %m");
- if (strcmp(name, log_name))
- {
- strcpy(log_name, name);
- fd = open(name, O_WRONLY | O_CREAT | O_APPEND, 0666);
- if (fd < 0)
- die("Unable to open log file %s: %m", name);
- close(2);
- dup(fd);
- close(fd);
- close(1);
- dup(2);
- }
- log_switch_nest--;
-}
-
-void
-log_switch(void)
-{
- time_t tim = time(NULL);
- do_log_switch(localtime(&tim));
-}
-
-static inline void
-internal_log_switch(struct tm *tm)
-{
- if (!log_switch_nest)
- do_log_switch(tm);
-}
+int log_pid;
+int log_precise_timings;
+void (*log_die_hook)(void);
+void (*log_switch_hook)(struct tm *tm);
void
vlog_msg(unsigned int cat, const char *msg, va_list args)
{
- time_t tim = time(NULL);
- struct tm *tm = localtime(&tim);
+ struct timeval tv;
+ struct tm tm;
byte *buf, *p;
int buflen = 256;
int l, l0, r;
+ va_list args2;
- internal_log_switch(tm);
+ gettimeofday(&tv, NULL);
+ if (!localtime_r(&tv.tv_sec, &tm))
+ bzero(&tm, sizeof(tm));
+
+ if (log_switch_hook)
+ log_switch_hook(&tm);
while (1)
{
p = buf = alloca(buflen);
*p++ = cat;
- p += strftime(p, buflen, " %Y-%m-%d %H:%M:%S ", tm);
+ /* We cannot use strftime() here, because it's not re-entrant */
+ p += sprintf(p, " %4d-%02d-%02d %02d:%02d:%02d", tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
+ tm.tm_hour, tm.tm_min, tm.tm_sec);
+ if (log_precise_timings)
+ p += sprintf(p, ".%06d", (int)tv.tv_usec);
+ *p++ = ' ';
if (log_title)
{
if (log_pid)
}
l0 = p - buf + 1;
r = buflen - l0;
- l = vsnprintf(p, r, msg, args);
+ va_copy(args2, args);
+ l = vsnprintf(p, r, msg, args2);
+ va_end(args2);
if (l < 0)
l = r;
else if (l < r)
}
void
-die(byte *msg, ...)
+die(const char *msg, ...)
{
va_list args;
va_start(args, msg);
vlog_msg(L_FATAL, msg, args);
va_end(args);
+ if (log_die_hook)
+ log_die_hook();
#ifdef DEBUG_DIE_BY_ABORT
abort();
#else
#endif
}
-#ifdef DEBUG
void
assert_failed(char *assertion, char *file, int line)
{
log(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line);
abort();
}
-#else
+
void
-assert_failed(void)
+assert_failed_noinfo(void)
{
die("Internal error: Assertion failed.");
}
-#endif
static byte *
log_basename(byte *n)
byte *p = n;
while (*n)
- if (*n++ == '/')
- p = n;
+ if (*n++ == '/')
+ p = n;
return p;
}
log_title = log_progname;
}
}
-
-void
-log_file(byte *name)
-{
- if (name)
- {
- if (log_name_patt)
- xfree(log_name_patt);
- if (log_name)
- {
- xfree(log_name);
- log_name = NULL;
- }
- log_name_patt = xstrdup(name);
- log_params = !!strchr(name, '%');
- log_name_size = strlen(name) + 64; /* 63 is an upper bound on expansion of % escapes */
- log_name = xmalloc(log_name_size);
- log_name[0] = 0;
- log_switch();
- close(0);
- open("/dev/null", O_RDWR, 0);
- }
-}