From 820fc48f249012c673eb38f63dd8b5ee039627d0 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 17 Jul 2009 13:24:37 +0200 Subject: [PATCH] udevd: add timestamp to --debug output --- libudev/libudev-util-private.c | 3 ++- udev/udevd.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c index 5f5f4c1d..f7daa946 100644 --- a/libudev/libudev-util-private.c +++ b/libudev/libudev-util-private.c @@ -249,6 +249,8 @@ int util_run_program(struct udev *udev, const char *command, char **envp, int i; int err = 0; + info(udev, "'%s' started\n", command); + /* build argv from command */ util_strscpy(arg, sizeof(arg), command); i = 0; @@ -273,7 +275,6 @@ int util_run_program(struct udev *udev, const char *command, char **envp, argv[0] = arg; argv[1] = NULL; } - info(udev, "'%s'\n", command); /* prepare pipes from child to parent */ if (result != NULL || udev_get_log_priority(udev) >= LOG_INFO) { diff --git a/udev/udevd.c b/udev/udevd.c index 2cdc18b4..69d509ce 100644 --- a/udev/udevd.c +++ b/udev/udevd.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -53,8 +54,15 @@ static void log_fn(struct udev *udev, int priority, const char *format, va_list args) { if (debug) { - fprintf(stderr, "[%d] %s: ", (int) getpid(), fn); - vfprintf(stderr, format, args); + char buf[1024]; + struct timeval tv; + struct timezone tz; + + vsnprintf(buf, sizeof(buf), format, args); + gettimeofday(&tv, &tz); + fprintf(stderr, "%llu.%06u [%u] %s: %s", + (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec, + (int) getpid(), fn, buf); } else { vsyslog(priority, format, args); } @@ -266,6 +274,7 @@ static void worker_new(struct event *event) struct worker_message msg; int err; + info(event->udev, "seq %llu running\n", udev_device_get_seqnum(dev)); udev_event = udev_event_new(dev); if (udev_event == NULL) _exit(3); -- 2.39.5