From ea62aa24ae49091e88e18ab9a7e310eb5faf4520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 21 May 2019 09:50:05 +0200 Subject: [PATCH] analyze: also print unix time in "timestamp" --- man/systemd-analyze.xml | 17 ++++++++++------- src/analyze/analyze.c | 6 ++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index cc29e26240..651a73848e 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -402,18 +402,21 @@ Normalized form: *-02-29 00:00:00 $ systemd-analyze timestamp yesterday now tomorrow Original form: yesterday -Normalized form: Thu 2019-05-16 00:00:00 CEST - (in UTC): Wed 2019-05-15 22:00:00 UTC +Normalized form: Mon 2019-05-20 00:00:00 CEST + (in UTC): Sun 2019-05-19 22:00:00 UTC + UNIX seconds: @15583032000 From now: 1 day 9h ago Original form: now -Normalized form: Fri 2019-05-17 09:34:14 CEST - (in UTC): Fri 2019-05-17 07:34:14 UTC - From now: 32us ago +Normalized form: Tue 2019-05-21 09:48:39 CEST + (in UTC): Tue 2019-05-21 07:48:39 UTC + UNIX seconds: @1558424919.659757 + From now: 43us ago Original form: tomorrow -Normalized form: Sat 2019-05-18 00:00:00 CEST - (in UTC): Fri 2019-05-17 22:00:00 UTC +Normalized form: Wed 2019-05-22 00:00:00 CEST + (in UTC): Tue 2019-05-21 22:00:00 UTC + UNIX seconds: @15584760000 From now: 14h left diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index b23dcf7240..5217a92b43 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1735,6 +1735,12 @@ static int test_timestamp_one(const char *p) { if (!in_utc_timezone()) printf(" (in UTC): %s\n", format_timestamp_utc(buf, sizeof buf, usec)); + printf(" UNIX seconds: @%"PRI_USEC"%s%0*"PRI_USEC"\n", + usec / USEC_PER_SEC, + usec % USEC_PER_SEC ? "." : "", + usec % USEC_PER_SEC ? 6 : 0, + usec % USEC_PER_SEC); + printf(" From now: %s\n", format_timestamp_relative(buf, sizeof buf, usec)); return 0;