X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevd.c;h=968b41667e356b2a81b6b8cff467506e83feb2e3;hp=414f0dbbb5cf2457dc9566782198e882d831adf6;hb=29bbefe42883a660c6769f042e7bafdf151d720b;hpb=2181d30a342dd9fb168b7077ae5095849e328689

diff --git a/udev/udevd.c b/udev/udevd.c
index 414f0dbbb..968b41667 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -55,13 +55,12 @@ static void log_fn(struct udev *udev, int priority,
 {
 	if (debug) {
 		char buf[1024];
-		struct timeval tv;
-		struct timezone tz;
+		struct timespec ts;
 
 		vsnprintf(buf, sizeof(buf), format, args);
-		gettimeofday(&tv, &tz);
+		clock_gettime(CLOCK_MONOTONIC, &ts);
 		fprintf(stderr, "%llu.%06u [%u] %s: %s",
-			(unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+			(unsigned long long) ts.tv_sec, (unsigned int) ts.tv_nsec/1000,
 			(int) getpid(), fn, buf);
 	} else {
 		vsyslog(priority, format, args);
@@ -247,8 +246,6 @@ static void worker_new(struct event *event)
 		close(fd_signal);
 		close(fd_ep);
 		close(worker_watch[READ_END]);
-		udev_log_close();
-		udev_log_init("udevd-work");
 
 		sigfillset(&mask);
 		fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
@@ -367,9 +364,6 @@ static void worker_new(struct event *event)
 						switch (fdsi.ssi_signo) {
 						case SIGTERM:
 							goto out;
-						case SIGALRM:
-							rc = EXIT_FAILURE;
-							goto out;
 						}
 					}
 				}
@@ -811,15 +805,29 @@ static void handle_signal(struct udev *udev, int signo)
 
 				if (worker->pid != pid)
 					continue;
-
 				info(udev, "worker [%u] exit\n", pid);
+
+				if (WIFEXITED(status)) {
+					if (WEXITSTATUS(status) != 0)
+						err(udev, "worker [%u] exit with return code %i\n", pid, WEXITSTATUS(status));
+				} else if (WIFSIGNALED(status)) {
+					err(udev, "worker [%u] terminated by signal %i (%s)\n",
+					    pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+				} else if (WIFSTOPPED(status)) {
+					err(udev, "worker [%u] stopped\n", pid);
+				} else if (WIFCONTINUED(status)) {
+					err(udev, "worker [%u] continued\n", pid);
+				} else {
+					err(udev, "worker [%u] exit with status 0x%04x\n", pid, status);
+				}
+
 				if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-					err(udev, "worker [%u] unexpectedly returned with status 0x%04x\n", pid, status);
 					if (worker->event != NULL) {
-						err(udev, "worker [%u] failed while handling '%s'\n", pid, worker->event->devpath);
+						err(udev, "worker [%u] failed while handling '%s'\n",
+						    pid, worker->event->devpath);
 						worker->event->exitcode = -32;
 						event_queue_delete(worker->event, true);
-						/* drop reference from running event */
+						/* drop reference taken for state 'running' */
 						worker_unref(worker);
 					}
 				}
@@ -1061,7 +1069,7 @@ static int convert_db(struct udev *udev)
 
 	f = fopen("/dev/kmsg", "w");
 	if (f != NULL) {
-		fprintf(f, "<30>udev[%u]: converting old udev database\n", getpid());
+		fprintf(f, "<30>udevd[%u]: converting old udev database\n", getpid());
 		fclose(f);
 	}
 
@@ -1396,6 +1404,13 @@ int main(int argc, char *argv[])
 
 	udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024);
 
+	/* create queue file before signalling 'ready', to make sure we block 'settle' */
+	udev_queue_export = udev_queue_export_new(udev);
+	if (udev_queue_export == NULL) {
+		err(udev, "error creating queue file\n");
+		goto exit;
+	}
+
 	if (daemonize) {
 		pid_t pid;
 		int fd;
@@ -1409,8 +1424,8 @@ int main(int argc, char *argv[])
 			rc = 4;
 			goto exit;
 		default:
-			rc = 0;
-			goto exit;
+			rc = EXIT_SUCCESS;
+			goto exit_keep_queue;
 		}
 
 		setsid();
@@ -1436,7 +1451,7 @@ int main(int argc, char *argv[])
 
 	f = fopen("/dev/kmsg", "w");
 	if (f != NULL) {
-		fprintf(f, "<30>udev[%u]: starting version " VERSION "\n", getpid());
+		fprintf(f, "<30>udevd[%u]: starting version " VERSION "\n", getpid());
 		fclose(f);
 	}
 
@@ -1509,12 +1524,6 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	udev_queue_export = udev_queue_export_new(udev);
-	if (udev_queue_export == NULL) {
-		err(udev, "error creating queue file\n");
-		goto exit;
-	}
-
 	memset(&ep_ctrl, 0, sizeof(struct epoll_event));
 	ep_ctrl.events = EPOLLIN;
 	ep_ctrl.data.fd = fd_ctrl;
@@ -1696,9 +1705,10 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	udev_queue_export_cleanup(udev_queue_export);
-	rc = 0;
+	rc = EXIT_SUCCESS;
 exit:
+	udev_queue_export_cleanup(udev_queue_export);
+exit_keep_queue:
 	if (fd_ep >= 0)
 		close(fd_ep);
 	worker_list_cleanup(udev);