udevadm: settle - add verbose output when running into timeout

[elogind.git] / udevsettle.c

diff --git a/udevsettle.c b/udevsettle.c
index 42a03bafe38cd15452b0a63061eead1b44319e6d..cb63a66bba6bf624cf76a2ea95c4e94ab5bbfbc9 100644 (file)
--- a/udevsettle.c
+++ b/udevsettle.c
@@ -35,22 +35,39 @@
 #define DEFAULT_TIMEOUT                        180
 #define LOOP_PER_SECOND                        20
 
-
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
+static void print_queue(const char *dir)
 {
-       va_list args;
+       LIST_HEAD(files);
+       struct name_entry *item;
 
-       if (priority > udev_log_priority)
+       if (add_matching_files(&files, dir, NULL) < 0)
                return;
 
-       va_start(args, format);
-       vsyslog(priority, format, args);
-       va_end(args);
+       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");
 }
-#endif
 
-int main(int argc, char *argv[], char *envp[])
+int udevsettle(int argc, char *argv[], char *envp[])
 {
        char queuename[PATH_SIZE];
        char filename[PATH_SIZE];
@@ -72,7 +89,7 @@ int main(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) {
@@ -87,10 +104,10 @@ int main(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: udevsettle [--help] [--timeout=<seconds>]\n\n");
+                       printf("Usage: udevadm settle [--help] [--timeout=<seconds>]\n\n");
                        goto exit;
                }
        }
@@ -105,13 +122,14 @@ int main(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;
                }
 
@@ -127,7 +145,7 @@ int main(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));
@@ -141,16 +159,16 @@ int main(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: