oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

**** Merged from HEAD ****

Browse Source 
1999-05-07  Martin Baulig  <martin@home-of-linux.org>

	* timings.c (timersub): Renamed this to `libgtop_timersub' and define
	it on all systems.
This commit is contained in:
Martin Baulig
1999-05-27 23:19:38 +00:00
committed by Martin Baulig
parent efb913acff
commit 39b2fffe83
2 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/ChangeLog
View File

@@ -3,6 +3,11 @@
* first.c, second.c, sysdeps.c: Use LibGTop version conditionals
so we can more easily merge the code into LIBGTOP_STABLE_1_0.
1999-05-07 Martin Baulig <martin@home-of-linux.org>
* timings.c (timersub): Renamed this to `libgtop_timersub' and define
it on all systems.
1999-03-17 Martin Baulig <martin@home-of-linux.org>
* first.c, second.c: Fixed a bug that caused a core dump when

62
examples/timings.c
View File

@@ -47,8 +47,7 @@
#define ELAPSED_UTIME ((unsigned long) elapsed_utime.tv_sec * 1000000 + (unsigned long) elapsed_utime.tv_usec)
#define ELAPSED_STIME ((unsigned long) elapsed_stime.tv_sec * 1000000 + (unsigned long) elapsed_stime.tv_usec)
#if defined(__bsdi__)
#define timeradd(tvp, uvp, vvp) \
#define libgtop_timeradd(tvp, uvp, vvp) \
do { \
(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
@@ -57,7 +56,7 @@
(vvp)->tv_usec -= 1000000; \
} \
} while (0)
#define timersub(tvp, uvp, vvp) \
#define libgtop_timersub(tvp, uvp, vvp) \
do { \
(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
@@ -66,7 +65,6 @@
(vvp)->tv_usec += 1000000; \
} \
} while (0)
#endif
int
main (int argc, char *argv [])
@@ -103,10 +101,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("CPU (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -121,10 +119,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Memory (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -139,10 +137,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Swap (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -157,10 +155,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Uptime (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -175,10 +173,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Loadavg (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -197,10 +195,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Proclist (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -220,10 +218,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Proc_State (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -238,10 +236,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Proc_Uid (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -256,10 +254,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Proc_Mem (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -274,10 +272,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Proc_Segment (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -292,10 +290,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Proc_Time (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -310,10 +308,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Proc_Signal (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -328,10 +326,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &rusage_end);
timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
&elapsed_utime);
timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
&elapsed_stime);
printf ("Proc_Kernel (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
@@ -341,10 +339,10 @@ main (int argc, char *argv [])
getrusage (RUSAGE_SELF, &total_end);
timersub (&total_end.ru_utime, &total_start.ru_utime,
libgtop_timersub (&total_end.ru_utime, &total_start.ru_utime,
&elapsed_utime);
timersub (&total_end.ru_stime, &total_start.ru_stime,
libgtop_timersub (&total_end.ru_stime, &total_start.ru_stime,
&elapsed_stime);
printf ("-------------------------------------------"