X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogs-show.c;h=8a35caf23a42b183e210495105f22ed326634d40;hp=358aea176ff20073d5a9124654fcd8d4bdeffcfc;hb=bf96736674b8d898e2262a9f429e93b3bb153fa2;hpb=55d7bfc19b72eca09d2bb7c9c73a62c886d8b9b4 diff --git a/src/logs-show.c b/src/logs-show.c index 358aea176..8a35caf23 100644 --- a/src/logs-show.c +++ b/src/logs-show.c @@ -58,12 +58,15 @@ static int parse_field(const void *data, size_t length, const char *field, char return 0; nl = length - fl; - buf = memdup((const char*) data + fl, nl); + buf = malloc(nl+1); + memcpy(buf, (const char*) data + fl, nl); + ((char*)buf)[nl] = 0; if (!buf) { log_error("Out of memory"); return -ENOMEM; } + free(*target); *target = buf; *target_size = nl; @@ -83,17 +86,13 @@ static bool shall_print(bool show_all, char *p, size_t l) { return true; } -static int output_short(sd_journal *j, unsigned line, bool show_all) { +static int output_short(sd_journal *j, unsigned line, bool show_all, bool monotonic_mode) { int r; - uint64_t realtime; - time_t t; - struct tm tm; - char buf[64]; const void *data; size_t length; size_t n = 0; - char *hostname = NULL, *tag = NULL, *comm = NULL, *pid = NULL, *message = NULL; - size_t hostname_len = 0, tag_len = 0, comm_len = 0, pid_len = 0, message_len = 0; + char *hostname = NULL, *identifier = NULL, *comm = NULL, *pid = NULL, *fake_pid = NULL, *message = NULL, *realtime = NULL, *monotonic = NULL; + size_t hostname_len = 0, identifier_len = 0, comm_len = 0, pid_len = 0, fake_pid_len = 0, message_len = 0, realtime_len = 0, monotonic_len = 0; assert(j); @@ -105,7 +104,7 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { else if (r > 0) continue; - r = parse_field(data, length, "SYSLOG_TAG=", &tag, &tag_len); + r = parse_field(data, length, "SYSLOG_IDENTIFIER=", &identifier, &identifier_len); if (r < 0) goto finish; else if (r > 0) @@ -123,6 +122,24 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { else if (r > 0) continue; + r = parse_field(data, length, "SYSLOG_PID=", &fake_pid, &fake_pid_len); + if (r < 0) + goto finish; + else if (r > 0) + continue; + + r = parse_field(data, length, "_SOURCE_REALTIME_TIMESTAMP=", &realtime, &realtime_len); + if (r < 0) + goto finish; + else if (r > 0) + continue; + + r = parse_field(data, length, "_SOURCE_MONOTONIC_TIMESTAMP=", &monotonic, &monotonic_len); + if (r < 0) + goto finish; + else if (r > 0) + continue; + r = parse_field(data, length, "MESSAGE=", &message, &message_len); if (r < 0) goto finish; @@ -133,29 +150,60 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { goto finish; } - r = sd_journal_get_realtime_usec(j, &realtime); - if (r < 0) { - log_error("Failed to get realtime: %s", strerror(-r)); - goto finish; - } + if (monotonic_mode) { + uint64_t t; + r = -ENOENT; - t = (time_t) (realtime / USEC_PER_SEC); - if (strftime(buf, sizeof(buf), "%b %d %H:%M:%S", localtime_r(&t, &tm)) <= 0) { - log_error("Failed to format time."); - goto finish; - } + if (monotonic) + r = safe_atou64(monotonic, &t); - fputs(buf, stdout); - n += strlen(buf); + if (r < 0) + r = sd_journal_get_monotonic_usec(j, &t, NULL); + + if (r >= 0) { + printf("[%5llu.%06llu]", + (unsigned long long) (t / USEC_PER_SEC), + (unsigned long long) (t % USEC_PER_SEC)); + + n += 1 + 5 + 1 + 6 + 1; + } + + } else { + char buf[64]; + uint64_t x; + time_t t; + struct tm tm; + r = -ENOENT; + + if (realtime) + r = safe_atou64(realtime, &x); + + if (r < 0) + r = sd_journal_get_realtime_usec(j, &x); + + if (r < 0) { + log_error("Failed to get realtime: %s", strerror(-r)); + goto finish; + } + + t = (time_t) (x / USEC_PER_SEC); + if (strftime(buf, sizeof(buf), "%b %d %H:%M:%S", localtime_r(&t, &tm)) <= 0) { + log_error("Failed to format time."); + goto finish; + } + + fputs(buf, stdout); + n += strlen(buf); + } if (hostname && shall_print(show_all, hostname, hostname_len)) { printf(" %.*s", (int) hostname_len, hostname); n += hostname_len + 1; } - if (tag && shall_print(show_all, tag, tag_len)) { - printf(" %.*s", (int) tag_len, tag); - n += tag_len + 1; + if (identifier && shall_print(show_all, identifier, identifier_len)) { + printf(" %.*s", (int) identifier_len, identifier); + n += identifier_len + 1; } else if (comm && shall_print(show_all, comm, comm_len)) { printf(" %.*s", (int) comm_len, comm); n += comm_len + 1; @@ -164,6 +212,9 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { if (pid && shall_print(show_all, pid, pid_len)) { printf("[%.*s]", (int) pid_len, pid); n += pid_len + 2; + } else if (fake_pid && shall_print(show_all, fake_pid, fake_pid_len)) { + printf("[%.*s]", (int) fake_pid_len, fake_pid); + n += fake_pid_len + 2; } if (show_all) @@ -190,14 +241,25 @@ static int output_short(sd_journal *j, unsigned line, bool show_all) { finish: free(hostname); - free(tag); + free(identifier); free(comm); free(pid); + free(fake_pid); free(message); + free(monotonic); + free(realtime); return r; } +static int output_short_realtime(sd_journal *j, unsigned line, bool show_all) { + return output_short(j, line, show_all, false); +} + +static int output_short_monotonic(sd_journal *j, unsigned line, bool show_all) { + return output_short(j, line, show_all, true); +} + static int output_verbose(sd_journal *j, unsigned line, bool show_all) { const void *data; size_t length; @@ -421,7 +483,8 @@ static int output_json(sd_journal *j, unsigned line, bool show_all) { } static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, bool show_all) = { - [OUTPUT_SHORT] = output_short, + [OUTPUT_SHORT] = output_short_realtime, + [OUTPUT_SHORT_MONOTONIC] = output_short_monotonic, [OUTPUT_VERBOSE] = output_verbose, [OUTPUT_EXPORT] = output_export, [OUTPUT_JSON] = output_json @@ -564,6 +627,7 @@ finish: static const char *const output_mode_table[_OUTPUT_MODE_MAX] = { [OUTPUT_SHORT] = "short", + [OUTPUT_SHORT_MONOTONIC] = "short-monotonic", [OUTPUT_VERBOSE] = "verbose", [OUTPUT_EXPORT] = "export", [OUTPUT_JSON] = "json"