picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

udevd: add timestamp to --debug output

Browse source
This commit is contained in:
Kay Sievers 2009-07-17 13:24:37 +02:00
parent 9528405c4a
commit 820fc48f24
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libudev/libudev-util-private.c
View file

@ -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) {

13
udev/udevd.c
View file

@ -31,6 +31,7 @@
#include <time.h>
#include <getopt.h>
#include <dirent.h>
#include <sys/time.h>
#include <sys/prctl.h>
#include <sys/socket.h>
#include <sys/signalfd.h>
@ -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);