32624: use correct scaling factor (clock ticks) for times

3 files changed, 24 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 4717bfee7..5a752b17f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-05-29  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 32624:  Src/builtin.c, Src/jobs.c: use correct scaling factor
+	(clock ticks) for times.
+
 	* Keerthan Jai: users/18860: Completion/Unix/Command/_man: man
 	-M overrides manpath.
 
diff --git a/Src/builtin.c b/Src/builtin.c
index 0cc54b7bb..42354b928 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -6095,8 +6095,9 @@ bin_test(char *name, char **argv, UNUSED(Options ops), int func)
 }
 
 /* display a time, provided in units of 1/60s, as minutes and seconds */
-#define pttime(X) printf("%ldm%ld.%02lds",((long) (X))/3600,\
-			 ((long) (X))/60%60,((long) (X))*100/60%100)
+#define pttime(X) printf("%ldm%ld.%02lds",((long) (X))/(60 * clktck),\
+			 ((long) (X))/clktck%clktck,\
+			 ((long) (X))*100/clktck%100)
 
 /* times: display, in a two-line format, the times provided by times(3) */
 
@@ -6105,6 +6106,7 @@ int
 bin_times(UNUSED(char *name), UNUSED(char **argv), UNUSED(Options ops), UNUSED(int func))
 {
     struct tms buf;
+    long clktck = get_clktck();
 
     /* get time accounting information */
     if (times(&buf) == -1)
diff --git a/Src/jobs.c b/Src/jobs.c
index 871946598..c4a0707d4 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -618,13 +618,11 @@ setprevjob(void)
 }
 
 /**/
-#ifndef HAVE_GETRUSAGE
-static long clktck = 0;
-
-/**/
-static void
-set_clktck(void)
+long
+get_clktck(void)
 {
+    static long clktck;
+
 #ifdef _SC_CLK_TCK
     if (!clktck)
 	/* fetch clock ticks per second from *
@@ -646,9 +644,9 @@ set_clktck(void)
 #  endif
 # endif
 #endif
+
+     return clktck;
 }
-/**/
-#endif
 
 /**/
 static void
@@ -698,11 +696,13 @@ printtime(struct timeval *real, child_times_t *ti, char *desc)
     percent = 100.0 * total_time
 	/ (real->tv_sec + real->tv_usec / 1000000.0);
 #else
-    set_clktck();
-    user_time    = ti->ut / (double) clktck;
-    system_time  = ti->st / (double) clktck;
-    percent      =  100.0 * (ti->ut + ti->st)
-	/ (clktck * real->tv_sec + clktck * real->tv_usec / 1000000.0);
+    {
+	long clktck = get_clktck();
+	user_time    = ti->ut / (double) clktck;
+	system_time  = ti->st / (double) clktck;
+	percent      =  100.0 * (ti->ut + ti->st)
+	    / (clktck * real->tv_sec + clktck * real->tv_usec / 1000000.0);
+    }
 #endif
 
     queue_signals();
@@ -910,8 +910,10 @@ should_report_time(Job j)
 	reporttime--;
     return reporttime <= 0;
 #else
-    set_clktck();
-    return ((j->procs->ti.ut + j->procs->ti.st) / clktck >= reporttime);
+    {
+	clktck = get_clktck();
+	return ((j->procs->ti.ut + j->procs->ti.st) / clktck >= reporttime);
+    }
 #endif
 }