From bf6ffd357da29f0856802112584ce080be6eb074 Mon Sep 17 00:00:00 2001
From: dwarning <dwarning>
Date: Wed, 6 Nov 2024 14:32:26 +0100
Subject: [PATCH] Keep it simple: use only one structure and get_time function

---
 src/frontend/resource.c |  9 ++++-----
 src/misc/misc_time.c    | 17 -----------------
 src/misc/misc_time.h    |  8 --------
 src/sharedspice.c       |  3 ++-
 src/winmain.c           |  3 ++-
 5 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/frontend/resource.c b/src/frontend/resource.c
index 26de0e13c..baa347f4f 100644
--- a/src/frontend/resource.c
+++ b/src/frontend/resource.c
@@ -77,13 +77,10 @@ init_rlimits(void)
     ft_ckspace();
 }
 
-PerfTimer timer;
-
 void
 init_time(void)
 {
     perf_timer_get_time(&timebegin);
-    perf_timer_start(&timer);
 }
 
 
@@ -158,6 +155,7 @@ printres(char *name)
     static bool called = FALSE;
     static long last_sec = 0, last_msec = 0;
     struct variable *v, *vfree = NULL;
+    PerfTime timenow;               /* actual time stamp */
     char *cpu_elapsed;
 
     if (!name || eq(name, "totalcputime") || eq(name, "cputime")) {
@@ -168,8 +166,9 @@ printres(char *name)
  || defined (HAVE_GETTIMEOFDAY) || defined(HAVE_TIMES) \
  || defined (HAVE_GETRUSAGE) || defined(HAVE_FTIME)
 
-        perf_timer_stop(&timer);
-        perf_timer_elapsed_sec_ms(&timer, &total_sec, &total_msec);
+        perf_timer_get_time(&timenow);
+        total_sec = timenow.seconds;
+        total_msec = timenow.milliseconds;
 
 #ifdef USE_OMP                            // this order have to be same as
         cpu_elapsed = "elapsed";          // the order in seconds() misc_time.c
diff --git a/src/misc/misc_time.c b/src/misc/misc_time.c
index 7c7707ede..61e037e88 100644
--- a/src/misc/misc_time.c
+++ b/src/misc/misc_time.c
@@ -159,23 +159,6 @@ seconds(void)
 #endif
 }
 
-void perf_timer_start(PerfTimer *timer)
-{
-    timer->start = seconds();
-}
-
-void perf_timer_stop(PerfTimer *timer)
-{
-    timer->end = seconds();
-}
-
-void perf_timer_elapsed_sec_ms(const PerfTimer *timer, int *seconds, int *milliseconds)
-{
-    double elapsed = timer->end - timer->start;
-    *seconds = (int)elapsed;
-    *milliseconds = (int)((elapsed - *seconds) * 1000.0);
-}
-
 void perf_timer_get_time(PerfTime *time)
 {
     time->secs = seconds();
diff --git a/src/misc/misc_time.h b/src/misc/misc_time.h
index e9b6f6691..a7943881c 100644
--- a/src/misc/misc_time.h
+++ b/src/misc/misc_time.h
@@ -9,20 +9,12 @@
 char * datestring(void);
 double seconds(void);
 
-typedef struct {
-    double start;
-    double end;
-} PerfTimer;
-
 typedef struct {
     double secs;
     int seconds;
     int milliseconds;
 } PerfTime;
 
-void perf_timer_start(PerfTimer *);
-void perf_timer_stop(PerfTimer *);
-void perf_timer_elapsed_sec_ms(const PerfTimer *, int *, int *);
 void perf_timer_get_time(PerfTime *);
 
 extern PerfTime timebegin;
diff --git a/src/sharedspice.c b/src/sharedspice.c
index 81161c951..117512cb4 100644
--- a/src/sharedspice.c
+++ b/src/sharedspice.c
@@ -1971,7 +1971,8 @@ void SetAnalyse(
 
    /* get current time */
    perf_timer_get_time(&timenow);
-   timediff(&timenow, &timebefore, &diffsec, &diffmillisec);
+   diffsec = timenow.seconds;
+   diffmillisec = timenow.milliseconds;
 
    s = TMALLOC(char, 128);
 
diff --git a/src/winmain.c b/src/winmain.c
index 8a70a0a32..c4144c487 100644
--- a/src/winmain.c
+++ b/src/winmain.c
@@ -233,7 +233,8 @@ SetAnalyse(char *Analyse,   /* in: analysis type */
 
     /* get actual time */
     perf_timer_get_time(&timenow);
-    timediff(&timenow, &timebefore, &diffsec, &diffmillisec);
+    diffsec = timenow.seconds;
+    diffmillisec = timenow.milliseconds;
 
     OldPercent = DecaPercent;
     /* output only into hwAnalyse window and if time elapsed is larger than