/*
* UCW Library -- Logging
*
- * (c) 1997--2005 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 <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/time.h>
#include <time.h>
#include <alloca.h>
char *log_filename;
char *log_title;
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)
+vmsg(unsigned int cat, const char *fmt, 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;
+ gettimeofday(&tv, NULL);
+ if (!localtime_r(&tv.tv_sec, &tm))
+ bzero(&tm, sizeof(tm));
+
if (log_switch_hook)
- log_switch_hook(tm);
+ 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;
va_copy(args2, args);
- l = vsnprintf(p, r, msg, args2);
+ l = vsnprintf(p, r, fmt, args2);
va_end(args2);
if (l < 0)
l = r;
}
void
-log_msg(unsigned int cat, const char *msg, ...)
+msg(unsigned int cat, const char *fmt, ...)
{
va_list args;
- va_start(args, msg);
- vlog_msg(cat, msg, args);
+ va_start(args, fmt);
+ vmsg(cat, fmt, args);
va_end(args);
}
void
-die(const char *msg, ...)
+die(const char *fmt, ...)
{
va_list args;
- va_start(args, msg);
- vlog_msg(L_FATAL, msg, args);
+ va_start(args, fmt);
+ vmsg(L_FATAL, fmt, args);
va_end(args);
if (log_die_hook)
log_die_hook();
}
void
-assert_failed(char *assertion, char *file, int line)
+assert_failed(const char *assertion, const char *file, int line)
{
- log(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line);
+ msg(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line);
abort();
}
die("Internal error: Assertion failed.");
}
-static byte *
-log_basename(byte *n)
+static const char *
+log_basename(const char *n)
{
- byte *p = n;
+ const char *p = n;
while (*n)
if (*n++ == '/')
}
void
-log_init(byte *argv0)
+log_init(const char *argv0)
{
if (argv0)
{