journal: introduce sd_journal_wait() to simplify writing synchronous clients

[elogind.git] / src / journal / journalctl.c

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index e9d918a733a78fdc381ff3b1f2a20f93d89d1750..7d8b8e51c82f7beb0316c0e745e2ffbb643a199f 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -49,6 +49,7 @@ static bool arg_no_tail = false;
 static bool arg_new_id128 = false;
 static bool arg_quiet = false;
 static bool arg_local = false;
+static bool arg_this_boot = false;
 
 static int help(void) {
 
@@ -64,8 +65,9 @@ static int help(void) {
                "  -o --output=STRING  Change journal output mode (short, short-monotonic,\n"
                "                      verbose, export, json, cat)\n"
                "  -q --quiet          Don't show privilege warning\n"
-               "     --new-id128      Generate a new 128 Bit id\n"
-               "  -l --local          Only local entries\n",
+               "  -l --local          Only local entries\n"
+               "  -b --this-boot      Show data only from current boot\n"
+               "     --new-id128      Generate a new 128 Bit id\n",
                program_invocation_short_name);
 
         return 0;
@@ -92,6 +94,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "new-id128", no_argument,       NULL, ARG_NEW_ID128 },
                 { "quiet",     no_argument,       NULL, 'q'           },
                 { "local",     no_argument,       NULL, 'l'           },
+                { "this-boot", no_argument,       NULL, 'b'           },
                 { NULL,        0,                 NULL, 0             }
         };
 
@@ -100,7 +103,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hfo:an:ql", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hfo:an:qlb", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -159,6 +162,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_local = true;
                         break;
 
+                case 'b':
+                        arg_this_boot = true;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -203,7 +210,7 @@ static int generate_new_id128(void) {
 }
 
 int main(int argc, char *argv[]) {
-        int r, i, fd;
+        int r, i;
         sd_journal *j = NULL;
         unsigned line = 0;
         bool need_seek = false;
@@ -232,6 +239,25 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        if (arg_this_boot) {
+                char match[9+32+1] = "_BOOT_ID=";
+                sd_id128_t boot_id;
+
+                r = sd_id128_get_boot(&boot_id);
+                if (r < 0) {
+                        log_error("Failed to get boot id: %s", strerror(-r));
+                        goto finish;
+                }
+
+                sd_id128_to_string(boot_id, match + 9);
+
+                r = sd_journal_add_match(j, match, strlen(match));
+                if (r < 0) {
+                        log_error("Failed to add match: %s", strerror(-r));
+                        goto finish;
+                }
+        }
+
         for (i = optind; i < argc; i++) {
                 if (path_is_absolute(argv[i])) {
                         char *p = NULL;
@@ -275,12 +301,6 @@ int main(int argc, char *argv[]) {
                 }
         }
 
-        fd = sd_journal_get_fd(j);
-        if (fd < 0) {
-                log_error("Failed to get wakeup fd: %s", strerror(-fd));
-                goto finish;
-        }
-
         if (!arg_quiet) {
                 usec_t start, end;
                 char start_buf[FORMAT_TIMESTAMP_MAX], end_buf[FORMAT_TIMESTAMP_MAX];
@@ -359,15 +379,9 @@ int main(int argc, char *argv[]) {
                 if (!arg_follow)
                         break;
 
-                r = fd_wait_for_event(fd, POLLIN, (usec_t) -1);
-                if (r < 0) {
-                        log_error("Couldn't wait for event: %s", strerror(-r));
-                        goto finish;
-                }
-
-                r = sd_journal_process(j);
+                r = sd_journal_wait(j, (uint64_t) -1);
                 if (r < 0) {
-                        log_error("Failed to process: %s", strerror(-r));
+                        log_error("Couldn't wait for log event: %s", strerror(-r));
                         goto finish;
                 }
         }