aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dumpcap.c4
-rw-r--r--ui/console.c2
-rw-r--r--ui/console.h2
-rw-r--r--wsutil/wslog.c106
-rw-r--r--wsutil/wslog.h11
5 files changed, 78 insertions, 47 deletions
diff --git a/dumpcap.c b/dumpcap.c
index a88103b0a8..6b560161e8 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -329,7 +329,7 @@ static gboolean need_timeout_workaround;
static void
dumpcap_log_writer(const char *domain, enum ws_log_level level,
- const char *timestamp,
+ ws_log_time_t timestamp,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap,
void *user_data);
@@ -5573,7 +5573,7 @@ main(int argc, char *argv[])
static void
dumpcap_log_writer(const char *domain, enum ws_log_level level,
- const char *timestamp,
+ ws_log_time_t timestamp,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap,
void *user_data _U_)
diff --git a/ui/console.c b/ui/console.c
index 0e495254c7..67c7efbd7e 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -21,7 +21,7 @@
void
console_log_writer(const char *domain, enum ws_log_level level,
- const char *timestamp,
+ ws_log_time_t timestamp,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap,
void *user_data _U_)
diff --git a/ui/console.h b/ui/console.h
index 663f31eca1..b8d92aef93 100644
--- a/ui/console.h
+++ b/ui/console.h
@@ -27,7 +27,7 @@ extern "C" {
*/
void
console_log_writer(const char *domain, enum ws_log_level level,
- const char *timestamp,
+ ws_log_time_t timestamp,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap,
void *user_data);
diff --git a/wsutil/wslog.c b/wsutil/wslog.c
index 7672e72c31..ceb1c4aaf3 100644
--- a/wsutil/wslog.c
+++ b/wsutil/wslog.c
@@ -7,6 +7,11 @@
*/
#include "config.h"
+
+#if defined(WS_DISABLE_ASSERT) && !defined(NDEBUG)
+#define NDEBUG
+#endif
+
#include "wslog.h"
#include <stdlib.h>
@@ -14,9 +19,6 @@
#include <errno.h>
#include <time.h>
#include <assert.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -712,13 +714,15 @@ static inline const char *color_off(gboolean enable)
return enable ? RESET : "";
}
+#define NANOSECS_IN_MICROSEC 1000
+
/*
* We must not call anything that might log a message
* in the log handler context (GLib might log a message if we register
* our own handler for the GLib domain).
*/
static void log_write_do_work(FILE *fp, gboolean use_color,
- const char *timestamp,
+ struct tm *when, long nanosecs,
const char *domain, enum ws_log_level level,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap)
@@ -730,12 +734,22 @@ static void log_write_do_work(FILE *fp, gboolean use_color,
fputs(" ** (noinit)", fp);
#endif
- /* Process - timestamp - priority */
- fprintf(fp, " ** (%s:%ld) %s [%s %s%s%s] ",
- registered_progname,
- (long)getpid(),
- timestamp,
- domain_to_string(domain),
+ /* Process */
+ fprintf(fp, " ** (%s:%ld) ", registered_progname, (long)getpid());
+
+ /* Timestamp */
+ if (when != NULL && nanosecs >= 0)
+ fprintf(fp, "%02d:%02d:%02d.%06ld ",
+ when->tm_hour, when->tm_min, when->tm_sec,
+ nanosecs / NANOSECS_IN_MICROSEC);
+ else if (when != NULL)
+ fprintf(fp, "%02d:%02d:%02d ",
+ when->tm_hour, when->tm_min, when->tm_sec);
+ else
+ fputs("(notime) ", fp);
+
+ /* Domain/level */
+ fprintf(fp, "[%s %s%s%s] ", domain_to_string(domain),
level_color_on(use_color, level),
ws_log_level_to_string(level),
color_off(use_color));
@@ -759,29 +773,32 @@ static void log_write_do_work(FILE *fp, gboolean use_color,
}
-#define NOTIME "(notime)"
-
-WS_RETNONNULL
-static const char *print_timestamp(char *buf, size_t size)
+static inline ws_log_time_t *get_timestamp(ws_log_time_t *ts)
{
-#ifdef _WIN32
- SYSTEMTIME lt;
-
- GetLocalTime(&lt);
- snprintf(buf, size, "%02d:%02d:%02d.%03d",
- lt.wHour, lt.wMinute, lt.wSecond, lt.wMilliseconds);
-#else
- struct timeval tv;
- struct tm *now;
-
- gettimeofday(&tv, NULL);
- now = localtime(&tv.tv_sec);
- if (now == NULL)
- return NOTIME;
- snprintf(buf, size, "%02d:%02d:%02d.%03ld",
- now->tm_hour, now->tm_min, now->tm_sec, (long)tv.tv_usec / 1000);
+ assert(ts);
+#if defined(HAVE_CLOCK_GETTIME)
+ if (clock_gettime(CLOCK_REALTIME, (struct timespec *)ts) == 0)
+ return ts;
+#elif defined(_WIN32)
+ if (timespec_get((struct timespec *)ts, TIME_UTC) == TIME_UTC)
+ return ts;
#endif
- return buf;
+ ts->tv_sec = time(NULL);
+ ts->tv_nsec = -1;
+ return ts;
+}
+
+
+static inline struct tm *get_localtime(time_t unix_time, struct tm **cookie)
+{
+ if (unix_time == (time_t)-1)
+ return NULL;
+ if (cookie && *cookie)
+ return *cookie;
+ struct tm *when = localtime(&unix_time);
+ if (cookie)
+ *cookie = when;
+ return when;
}
@@ -794,18 +811,19 @@ static void log_write_dispatch(const char *domain, enum ws_log_level level,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap)
{
- char timebuf[32];
- const char *tstamp;
+ ws_log_time_t tstamp;
+ struct tm *cookie = NULL;
- tstamp = print_timestamp(timebuf, sizeof(timebuf));
+ get_timestamp(&tstamp);
if (custom_log) {
va_list user_ap_copy;
G_VA_COPY(user_ap_copy, user_ap);
log_write_do_work(custom_log, FALSE,
- tstamp, domain, level,
- file, line, func,
+ get_localtime(tstamp.tv_sec, &cookie),
+ tstamp.tv_nsec,
+ domain, level, file, line, func,
user_format, user_ap_copy);
va_end(user_ap_copy);
}
@@ -815,8 +833,11 @@ static void log_write_dispatch(const char *domain, enum ws_log_level level,
user_format, user_ap, registered_log_writer_data);
}
else {
- log_write_do_work(stderr, color_enabled, tstamp, domain, level,
- file, line, func, user_format, user_ap);
+ log_write_do_work(stderr, color_enabled,
+ get_localtime(tstamp.tv_sec, &cookie),
+ tstamp.tv_nsec,
+ domain, level, file, line, func,
+ user_format, user_ap);
}
if (level >= fatal_log_level) {
@@ -876,13 +897,16 @@ void ws_log_full(const char *domain, enum ws_log_level level,
void ws_log_default_writer(const char *domain, enum ws_log_level level,
- const char *timestamp,
+ ws_log_time_t timestamp,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap,
void *user_data _U_)
{
- log_write_do_work(stderr, color_enabled, timestamp, domain, level,
- file, line, func, user_format, user_ap);
+ log_write_do_work(stderr, color_enabled,
+ get_localtime(timestamp.tv_sec, NULL),
+ timestamp.tv_nsec,
+ domain, level, file, line, func,
+ user_format, user_ap);
}
diff --git a/wsutil/wslog.h b/wsutil/wslog.h
index 5decee85ca..d7cce054e9 100644
--- a/wsutil/wslog.h
+++ b/wsutil/wslog.h
@@ -13,6 +13,7 @@
#include <ws_attributes.h>
#include <glib.h>
#include <stdio.h>
+#include <time.h>
#include <stdarg.h>
#include <ws_log_defs.h>
@@ -27,9 +28,15 @@
extern "C" {
#endif /* __cplusplus */
+typedef struct {
+ time_t tv_sec; /* -1 if no time source is available */
+ long tv_nsec; /* -1 if subsecond resolution is not available */
+} ws_log_time_t;
+
+
/** Callback for registering a log writer. */
typedef void (ws_log_writer_cb)(const char *domain, enum ws_log_level level,
- const char *timestamp,
+ ws_log_time_t timestamp,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap,
void *user_data);
@@ -41,7 +48,7 @@ typedef void (ws_log_writer_free_data_cb)(void *user_data);
WS_DLL_PUBLIC
void ws_log_default_writer(const char *domain, enum ws_log_level level,
- const char *timestamp,
+ ws_log_time_t timestamp,
const char *file, int line, const char *func,
const char *user_format, va_list user_ap,
void *user_data);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 09:11:10 +0000