bughz/sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SIGAR-19] Change cpu time units to milliseconds

Browse Source
This commit is contained in:
Doug MacEachern 2006-12-04 18:30:37 +00:00
parent 4b98533cba
commit 7fae53d95d
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/os/darwin/darwin_sigar.c
View File

@ -206,6 +206,8 @@ int sigar_os_open(sigar_t **sigar)
(*sigar)->pagesize = getpagesize(); (*sigar)->pagesize = getpagesize();
#ifdef __FreeBSD__ #ifdef __FreeBSD__
(*sigar)->ticks = 100; /* sysconf(_SC_CLK_TCK) == 128 !? */ (*sigar)->ticks = 100; /* sysconf(_SC_CLK_TCK) == 128 !? */
#else
(*sigar)->ticks = sysconf(_SC_CLK_TCK);
#endif #endif
(*sigar)->last_pid = -1; (*sigar)->last_pid = -1;
@ -486,10 +488,10 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
return errno; return errno;
} }
cpu->user = cpuload.cpu_ticks[CPU_STATE_USER]; cpu->user = SIGAR_TICK2MSEC(cpuload.cpu_ticks[CPU_STATE_USER]);
cpu->sys = cpuload.cpu_ticks[CPU_STATE_SYSTEM]; cpu->sys = SIGAR_TICK2MSEC(cpuload.cpu_ticks[CPU_STATE_SYSTEM]);
cpu->idle = cpuload.cpu_ticks[CPU_STATE_IDLE]; cpu->idle = SIGAR_TICK2MSEC(cpuload.cpu_ticks[CPU_STATE_IDLE]);
cpu->nice = cpuload.cpu_ticks[CPU_STATE_NICE]; cpu->nice = SIGAR_TICK2MSEC(cpuload.cpu_ticks[CPU_STATE_NICE]);
cpu->wait = 0; /*N/A*/ cpu->wait = 0; /*N/A*/
cpu->total = cpu->user + cpu->nice + cpu->sys + cpu->idle; cpu->total = cpu->user + cpu->nice + cpu->sys + cpu->idle;
@ -511,10 +513,10 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
return status; return status;
} }
cpu->user = SIGAR_TICK2SEC(cp_time[CP_USER]); cpu->user = SIGAR_TICK2MSEC(cp_time[CP_USER]);
cpu->nice = SIGAR_TICK2SEC(cp_time[CP_NICE]); cpu->nice = SIGAR_TICK2MSEC(cp_time[CP_NICE]);
cpu->sys = SIGAR_TICK2SEC(cp_time[CP_SYS] + cp_time[CP_INTR]); cpu->sys = SIGAR_TICK2MSEC(cp_time[CP_SYS] + cp_time[CP_INTR]);
cpu->idle = SIGAR_TICK2SEC(cp_time[CP_IDLE]); cpu->idle = SIGAR_TICK2MSEC(cp_time[CP_IDLE]);
cpu->wait = 0; /*N/A*/ cpu->wait = 0; /*N/A*/
cpu->total = cpu->user + cpu->nice + cpu->sys + cpu->idle; cpu->total = cpu->user + cpu->nice + cpu->sys + cpu->idle;
#endif #endif
@ -549,10 +551,10 @@ int sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist)
cpu = &cpulist->data[cpulist->number++]; cpu = &cpulist->data[cpulist->number++];
cpu->user = cpuload[i].cpu_ticks[CPU_STATE_USER]; cpu->user = SIGAR_TICK2MSEC(cpuload[i].cpu_ticks[CPU_STATE_USER]);
cpu->sys = cpuload[i].cpu_ticks[CPU_STATE_SYSTEM]; cpu->sys = SIGAR_TICK2MSEC(cpuload[i].cpu_ticks[CPU_STATE_SYSTEM]);
cpu->idle = cpuload[i].cpu_ticks[CPU_STATE_IDLE]; cpu->idle = SIGAR_TICK2MSEC(cpuload[i].cpu_ticks[CPU_STATE_IDLE]);
cpu->nice = cpuload[i].cpu_ticks[CPU_STATE_NICE]; cpu->nice = SIGAR_TICK2MSEC(cpuload[i].cpu_ticks[CPU_STATE_NICE]);
cpu->wait = 0; /*N/A*/ cpu->wait = 0; /*N/A*/
cpu->total = cpu->user + cpu->nice + cpu->sys + cpu->idle; cpu->total = cpu->user + cpu->nice + cpu->sys + cpu->idle;
} }
@ -787,6 +789,9 @@ int sigar_proc_cred_get(sigar_t *sigar, sigar_pid_t pid,
return SIGAR_OK; return SIGAR_OK;
} }
#define tv2msec(tv) \
(((sigar_uint64_t)tv.tv_sec * SIGAR_MSEC) + (((sigar_uint64_t)tv.tv_usec) / 1000))
#ifdef DARWIN #ifdef DARWIN
#define tval2msec(tval) \ #define tval2msec(tval) \
((tval.seconds * SIGAR_MSEC) + (tval.microseconds / 1000)) ((tval.seconds * SIGAR_MSEC) + (tval.microseconds / 1000))
@ -836,9 +841,6 @@ static int get_proc_times(sigar_pid_t pid, sigar_proc_time_t *time)
return SIGAR_OK; return SIGAR_OK;
} }
#else
#define tv2msec(tv) \
(((sigar_uint64_t)tv.tv_sec * SIGAR_MSEC) + (((sigar_uint64_t)tv.tv_usec) / 1000))
#endif #endif
int sigar_proc_time_get(sigar_t *sigar, sigar_pid_t pid, int sigar_proc_time_get(sigar_t *sigar, sigar_pid_t pid,