From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 Feb 2024 09:56:41 +0000 (+0100)
Subject: dmesg: fix delta calculation
X-Git-Tag: v2.40-rc2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34379fc97852f1fd9ac1bfb1b31acc2bc123699d;p=thirdparty%2Futil-linux.git

dmesg: fix delta calculation

Old:
./dmesg --nopager --color=never --decode --time-format delta  --kernel --since "@$t"
kern  :info  : [<18446744098961.000000>] bash (40091): drop_caches: 3

Fixed:
./dmesg --nopager --color=never --decode --time-format delta  --kernel --since "@$t"
kern  :info  : [<25251.997673>] bash (40091): drop_caches: 3

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit a355f2b78a8c486f7721371d9010f4f1bafcee00)
---

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 3dde45d54..48282f1e6 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -604,7 +604,7 @@ static const char *parse_kmsg_timestamp(const char *str0, struct timeval *tv)
 
 static double time_diff(struct timeval *a, struct timeval *b)
 {
-	return (a->tv_sec - b->tv_sec) + (a->tv_usec - b->tv_usec) / USEC_PER_SEC;
+	return (a->tv_sec - b->tv_sec) + (a->tv_usec - b->tv_usec) / (double) USEC_PER_SEC;
 }
 
 static int get_syslog_buffer_size(void)