From 8a28fe5b51ac14d51b7ebde6ba79f30cd6752d61 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Mon, 4 Dec 2006 03:54:29 +0000 Subject: [PATCH] [SIGAR-19] change process cpu time units to milliseconds --- src/os/darwin/darwin_sigar.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index 94d38956..dcf4f8a8 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -787,7 +787,13 @@ int sigar_proc_cred_get(sigar_t *sigar, sigar_pid_t pid, return SIGAR_OK; } +#define tv2sec(tv) \ + ((sigar_uint64_t)tv.tv_sec + (((sigar_uint64_t)tv.tv_usec) / 1000000)) + #ifdef DARWIN +#define tval2msec(tval) \ + ((tval.seconds * SIGAR_MSEC) + (tval.microseconds / 1000)) + static int get_proc_times(sigar_pid_t pid, sigar_proc_time_t *time) { unsigned int count; @@ -827,17 +833,14 @@ static int get_proc_times(sigar_pid_t pid, sigar_proc_time_t *time) time_value_add(&utime, &tti.user_time); time_value_add(&stime, &tti.system_time); - time->user = utime.seconds; - time->sys = stime.seconds; + time->user = tval2msec(utime); + time->sys = tval2msec(stime); time->total = time->user + time->sys; return SIGAR_OK; } #endif -#define tv2sec(tv) \ - ((sigar_uint64_t)tv.tv_sec + (((sigar_uint64_t)tv.tv_usec) / 1000000)) - int sigar_proc_time_get(sigar_t *sigar, sigar_pid_t pid, sigar_proc_time_t *proctime) {