add 'total time' to stats

Author: ColumPaget

CHANGELOG

@@ -1,9 +1,13 @@
+1.3 (2024-11-08)
+----------------
+  * don't include first item in 'minimum time' (as that will always be zero)
+  * add 'total time' to stats
+
 1.2 (2024-10-04)
 ----------------
   * handle useconds roll-over when calculating times
   * handle strace 'pid' header at start of line
 
-
 1.1 (2024-01-10)
 ----------------
   * handle 'dmesg' style timestamps

Makefile

@@ -1,12 +1,15 @@
-OBJ=parse.o stats.o settings.o help.o 
-FLAGS=-g -O2 -DPACKAGE_NAME=\"timediff\" -DPACKAGE_TARNAME=\"timediff\" -DPACKAGE_VERSION=\"1.2\" -DPACKAGE_STRING=\"timediff\ 1.2\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DHAVE_LIBZ=1 -DHAVE_LIBUSEFUL_5_LIBUSEFUL_H=1 -DHAVE_LIBUSEFUL_5=1
-LIBS=-lUseful-5 -lz 
+OBJ=common.o parse.o stats.o settings.o help.o 
+FLAGS=-g -O2 -DPACKAGE_NAME=\"timediff\" -DPACKAGE_TARNAME=\"timediff\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"timediff\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -D_FILE_OFFSET_BITS=64 -DHAVE_LIBZ=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBSSL=1 -DHAVE_LIBCAP=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIBUSEFUL_5_LIBUSEFUL_H=1 -DHAVE_LIBUSEFUL_5=1
+LIBS=-lUseful-5 -lcap -lssl -lcrypto -lz 
 STATIC_LIBS=
 PREFIX=/usr/local
 
 all: $(OBJ)
 	gcc $(FLAGS) -otimediff $(OBJ) main.c $(LIBS) $(STATIC_LIBS)
 
+common.o: common.h common.c
+	gcc $(FLAGS) -c common.c
+
 stats.o: stats.h stats.c
 	gcc $(FLAGS) -c stats.c
 

Makefile.in

@@ -1,4 +1,4 @@
-OBJ=parse.o stats.o settings.o help.o @LIBUSEFUL_BUNDLED@
+OBJ=common.o parse.o stats.o settings.o help.o @LIBUSEFUL_BUNDLED@
 FLAGS=@CFLAGS@ @DEFS@
 LIBS=@LIBS@
 STATIC_LIBS=@LIBUSEFUL_BUNDLED@
@@ -7,6 +7,9 @@ PREFIX=@prefix@
 all: $(OBJ)
 	gcc $(FLAGS) -otimediff $(OBJ) main.c $(LIBS) $(STATIC_LIBS)
 
+common.o: common.h common.c
+	gcc $(FLAGS) -c common.c
+
 stats.o: stats.h stats.c
 	gcc $(FLAGS) -c stats.c
 

common.c

@@ -0,0 +1,24 @@
+#include "common.h"
+
+double CalcTimediff(struct timeval *Prev, struct timeval *Curr)
+{
+    double secs=0, usec=0;
+
+    if (Prev->tv_sec > 0)
+    {
+        //calcluate secs as a floating point value with millisecond resolution
+        secs=difftime(Curr->tv_sec, Prev->tv_sec);
+        if (Curr->tv_usec < Prev->tv_usec)
+        {
+            secs-=1; //we have rolled over our usec, so there's actually one fewer second
+            usec=1000000 - Prev->tv_usec + Curr->tv_usec;
+        }
+        else usec=Curr->tv_usec - Prev->tv_usec;
+
+        secs += usec / 1000000;
+    }
+
+    return(secs);
+}
+
+

common.h

@@ -0,0 +1,8 @@
+#ifndef TIMEDIFF_COMMON_H
+#define TIMEDIFF_COMMON_H
+
+#include "includes.h"
+
+double CalcTimediff(struct timeval *Prev, struct timeval *Curr);
+
+#endif