26866f517f
Reorganize Makefile for clarity, and add a few comments. While here, regenerate the patches with makepatch. No functional changes.
30 lines
1.1 KiB
C
30 lines
1.1 KiB
C
--- Src/jobs.c.orig 2015-08-16 18:44:40 UTC
|
|
+++ Src/jobs.c
|
|
@@ -687,15 +687,15 @@ printtime(struct timeval *real, child_ti
|
|
/* go ahead and compute these, since almost every TIMEFMT will have them */
|
|
elapsed_time = real->tv_sec + real->tv_usec / 1000000.0;
|
|
|
|
+ long clktck = get_clktck();
|
|
#ifdef HAVE_GETRUSAGE
|
|
user_time = ti->ru_utime.tv_sec + ti->ru_utime.tv_usec / 1000000.0;
|
|
system_time = ti->ru_stime.tv_sec + ti->ru_stime.tv_usec / 1000000.0;
|
|
total_time = user_time + system_time;
|
|
- percent = 100.0 * total_time
|
|
- / (real->tv_sec + real->tv_usec / 1000000.0);
|
|
+ percent = 100.0 * total_time / elapsed_time;
|
|
+ total_time *= (double) clktck;
|
|
#else
|
|
{
|
|
- long clktck = get_clktck();
|
|
user_time = ti->ut / (double) clktck;
|
|
system_time = ti->st / (double) clktck;
|
|
percent = 100.0 * (ti->ut + ti->st)
|
|
@@ -791,7 +791,7 @@ printtime(struct timeval *real, child_ti
|
|
#endif
|
|
#ifdef HAVE_STRUCT_RUSAGE_RU_MAXRSS
|
|
case 'M':
|
|
- fprintf(stderr, "%ld", ti->ru_maxrss / 1024);
|
|
+ fprintf(stderr, "%ld", ti->ru_maxrss);
|
|
break;
|
|
#endif
|
|
#ifdef HAVE_STRUCT_RUSAGE_RU_MAJFLT
|