From f7fbed71c1d7035c4d6e02018649c02fb2c3196f Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 10 Apr 1995 13:20:25 +0000
Subject: [PATCH] Use gettimeofday(2) instead of time(2) to get log time in
 milliseconds.

---
 res+log/gw-log-test.c |    9 ++++++++-
 res+log/gw-log.c      |   16 +++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/res+log/gw-log-test.c b/res+log/gw-log-test.c
index 64bd92a..3d82ffc 100644
--- a/res+log/gw-log-test.c
+++ b/res+log/gw-log-test.c
@@ -4,7 +4,10 @@
  * Europagate, 1994-1995.
  *
  * $Log: gw-log-test.c,v $
- * Revision 1.3  1995/02/23 08:32:21  adam
+ * Revision 1.4  1995/04/10 13:20:25  adam
+ * Use gettimeofday(2) instead of time(2) to get log time in milliseconds.
+ *
+ * Revision 1.3  1995/02/23  08:32:21  adam
  * Changed header.
  *
  * Revision 1.1.1.1  1995/02/09  17:27:12  adam
@@ -25,6 +28,10 @@ int main (int argc, char **argv)
     gw_log_init (*argv);
 
     gw_log_file (GW_LOG_ALL, "all.log");
+    gw_log_file (GW_LOG_WARN, "warn.log");
+
+    gw_log (GW_LOG_ALL, "Msg", "Hi all except WARN");
+    gw_log (GW_LOG_WARN, "Msg", "Hi WARN");
 
     gw_log (GW_LOG_ALL, "Msg", "Hi all, a");
     gw_log (GW_LOG_STAT, "Msg", "Hi stat, a");
diff --git a/res+log/gw-log.c b/res+log/gw-log.c
index 4047908..901fb7b 100644
--- a/res+log/gw-log.c
+++ b/res+log/gw-log.c
@@ -4,7 +4,10 @@
  * Europagate, 1994-1995.
  *
  * $Log: gw-log.c,v $
- * Revision 1.6  1995/03/28 08:01:51  adam
+ * Revision 1.7  1995/04/10 13:20:25  adam
+ * Use gettimeofday(2) instead of time(2) to get log time in milliseconds.
+ *
+ * Revision 1.6  1995/03/28  08:01:51  adam
  * Bug fix: GW_LOG_ERRNO.
  *
  * Revision 1.5  1995/03/27  12:51:10  adam
@@ -27,6 +30,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <fcntl.h>
+#include <sys/time.h>
 #include <unistd.h>
 #include <time.h>
 #include <errno.h>
@@ -131,11 +135,11 @@ int gw_log (unsigned level_a, const char *event_type, const char *format, ...)
 {
     static char emit_str[2048];
     struct file_mask *list;
+    struct timeval tv;
     va_list ap;
     unsigned e_level = level_a & level;
     int count;
     int err = 0;
-    time_t time_now;
     struct tm tms;
     char *cp;
 
@@ -143,12 +147,14 @@ int gw_log (unsigned level_a, const char *event_type, const char *format, ...)
         return 0;
 
     va_start (ap, format);
-    time (&time_now);
-    memcpy (&tms, localtime (&time_now), sizeof(tms));
-    sprintf (emit_str, "%s %d %02d%02d%02d%02d%02d%02d %d %s ",
+    gettimeofday (&tv, NULL);
+
+    memcpy (&tms, localtime (&tv.tv_sec), sizeof(tms));
+    sprintf (emit_str, "%s %d %02d%02d%02d%02d%02d%02d%03d %d %s ",
              app_name, session,
              tms.tm_year, tms.tm_mon, tms.tm_mday,
              tms.tm_hour, tms.tm_min, tms.tm_sec,
+             (int) (tv.tv_usec/1000),
              e_level, event_type);
     if ((cp = strchr (emit_str, '\n')))    /* remove \n from ctime-str */
         *cp = ' ';
-- 
1.7.10.4