X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsettle.c;h=cb63a66bba6bf624cf76a2ea95c4e94ab5bbfbc9;hp=e3982a42b0d69bf4f160acf2e49976d47eccd77a;hb=98d8d24bcc668022857e1b4852ac37ce4400ddf8;hpb=225cb03bd851adc6d269b13bdf2b1bfded2b96b9

diff --git a/udevsettle.c b/udevsettle.c
index e3982a42b..cb63a66bb 100644
--- a/udevsettle.c
+++ b/udevsettle.c
@@ -35,6 +35,38 @@
 #define DEFAULT_TIMEOUT			180
 #define LOOP_PER_SECOND			20
 
+static void print_queue(const char *dir)
+{
+	LIST_HEAD(files);
+	struct name_entry *item;
+
+	if (add_matching_files(&files, dir, NULL) < 0)
+		return;
+
+	printf("\n\nAfter the udevadm settle timeout, the events queue contains:\n\n");
+
+	list_for_each_entry(item, &files, node) {
+		char target[NAME_SIZE];
+		size_t len;
+		const char *filename = strrchr(item->name, '/');
+
+		if (filename == NULL)
+			continue;
+		filename++;
+		if (*filename == '\0')
+			continue;
+
+		len = readlink(item->name, target, sizeof(target));
+		if (len < 0)
+			continue;
+		target[len] = '\0';
+
+		printf("%s: %s\n", filename, target);
+	}
+
+	printf("\n\n");
+}
+
 int udevsettle(int argc, char *argv[], char *envp[])
 {
 	char queuename[PATH_SIZE];
@@ -57,7 +89,7 @@ int udevsettle(int argc, char *argv[], char *envp[])
 
 	logging_init("udevsettle");
 	udev_config_init();
-	dbg("version %s", UDEV_VERSION);
+	dbg("version %s\n", UDEV_VERSION);
 	sysfs_init();
 
 	while (1) {
@@ -72,7 +104,7 @@ int udevsettle(int argc, char *argv[], char *envp[])
 				timeout = seconds;
 			else
 				fprintf(stderr, "invalid timeout value\n");
-			dbg("timeout=%i", timeout);
+			dbg("timeout=%i\n", timeout);
 			break;
 		case 'h':
 			printf("Usage: udevadm settle [--help] [--timeout=<seconds>]\n\n");
@@ -90,13 +122,14 @@ int udevsettle(int argc, char *argv[], char *envp[])
 			struct stat statbuf;
 
 			if (stat(queuename, &statbuf) < 0) {
-				info("queue is empty");
+				info("queue is empty\n");
 				break;
 			}
 			usleep(1000 * 1000 / LOOP_PER_SECOND);
 		}
 		if (loop <= 0) {
-			info("timeout waiting for queue");
+			info("timeout waiting for queue\n");
+			print_queue(queuename);
 			goto exit;
 		}
 
@@ -112,7 +145,7 @@ int udevsettle(int argc, char *argv[], char *envp[])
 			goto exit;
 		seqnum[len] = '\0';
 		seq_udev = strtoull(seqnum, NULL, 10);
-		info("udev seqnum = %llu", seq_udev);
+		info("udev seqnum = %llu\n", seq_udev);
 
 		/* read current kernel seqnum */
 		strlcpy(filename, sysfs_path, sizeof(filename));
@@ -126,16 +159,16 @@ int udevsettle(int argc, char *argv[], char *envp[])
 			goto exit;
 		seqnum[len] = '\0';
 		seq_kernel = strtoull(seqnum, NULL, 10);
-		info("kernel seqnum = %llu", seq_kernel);
+		info("kernel seqnum = %llu\n", seq_kernel);
 
 		/* make sure all kernel events have arrived in the queue */
 		if (seq_udev >= seq_kernel) {
-			info("queue is empty and no pending events left");
+			info("queue is empty and no pending events left\n");
 			rc = 0;
 			goto exit;
 		}
 		usleep(1000 * 1000 / LOOP_PER_SECOND);
-		info("queue is empty, but events still pending");
+		info("queue is empty, but events still pending\n");
 	}
 
 exit: