chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move syslog wrapper to libudev
[elogind.git]
/
udev
/
udevd.c
diff --git
a/udev/udevd.c
b/udev/udevd.c
index e7a0c9840aba4b23e71b0e36877c78bcf3bbdb6b..292f4374d7560c4d3d54dcd011bcbd502549acda 100644
(file)
--- a/
udev/udevd.c
+++ b/
udev/udevd.c
@@
-213,8
+213,8
@@
static void worker_new(struct event *event)
udev_ctrl_unref(udev_ctrl);
close(pfd[FD_SIGNAL].fd);
close(worker_watch[READ_END]);
udev_ctrl_unref(udev_ctrl);
close(pfd[FD_SIGNAL].fd);
close(worker_watch[READ_END]);
-
loggin
g_close();
-
loggin
g_init("udevd-work");
+
udev_lo
g_close();
+
udev_lo
g_init("udevd-work");
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
/* set signal handlers */
setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
/* set signal handlers */
@@
-288,7
+288,7
@@
static void worker_new(struct event *event)
}
udev_monitor_unref(worker_monitor);
}
udev_monitor_unref(worker_monitor);
-
loggin
g_close();
+
udev_lo
g_close();
exit(0);
}
case -1:
exit(0);
}
case -1:
@@
-307,6
+307,7
@@
static void worker_new(struct event *event)
event->state = EVENT_RUNNING;
udev_list_node_append(&worker->node, &worker_list);
childs++;
event->state = EVENT_RUNNING;
udev_list_node_append(&worker->node, &worker_list);
childs++;
+ info(event->udev, "seq %llu forked new worker [%u]\n", udev_device_get_seqnum(event->dev), pid);
break;
}
}
break;
}
}
@@
-701,6
+702,7
@@
static void handle_signal(struct udev *udev, int signo)
udev_list_node_remove(&worker->node);
worker_unref(worker);
childs--;
udev_list_node_remove(&worker->node);
worker_unref(worker);
childs--;
+ info(udev, "worker [%u] exit\n", pid);
break;
}
}
break;
}
}
@@
-761,7
+763,7
@@
int main(int argc, char *argv[])
if (udev == NULL)
goto exit;
if (udev == NULL)
goto exit;
-
loggin
g_init("udevd");
+
udev_lo
g_init("udevd");
udev_set_log_fn(udev, log_fn);
info(udev, "version %s\n", VERSION);
udev_selinux_init(udev);
udev_set_log_fn(udev, log_fn);
info(udev, "version %s\n", VERSION);
udev_selinux_init(udev);
@@
-1067,6
+1069,6
@@
exit:
udev_monitor_unref(monitor);
udev_selinux_exit(udev);
udev_unref(udev);
udev_monitor_unref(monitor);
udev_selinux_exit(udev);
udev_unref(udev);
-
loggin
g_close();
+
udev_lo
g_close();
return rc;
}
return rc;
}