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:22:51 +00:00
parent 46d43d99b8
commit 70cefa7c18
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/os/aix/aix_sigar.c
View File

@ -673,11 +673,11 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
sigar_log(sigar, SIGAR_LOG_DEBUG, "[cpu] using libperfstat"); sigar_log(sigar, SIGAR_LOG_DEBUG, "[cpu] using libperfstat");
if (sigar->perfstat.cpu_total(&cpu_data, sizeof(cpu_data)) == 1) { if (sigar->perfstat.cpu_total(&cpu_data, sizeof(cpu_data)) == 1) {
cpu->user = SIGAR_TICK2SEC(cpu_data.user); cpu->user = SIGAR_TICK2MSEC(cpu_data.user);
cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */ cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */
cpu->sys = SIGAR_TICK2SEC(cpu_data.sys); cpu->sys = SIGAR_TICK2MSEC(cpu_data.sys);
cpu->idle = SIGAR_TICK2SEC(cpu_data.idle); cpu->idle = SIGAR_TICK2MSEC(cpu_data.idle);
cpu->wait = SIGAR_TICK2SEC(cpu_data.wait); cpu->wait = SIGAR_TICK2MSEC(cpu_data.wait);
cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait; cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait;
return SIGAR_OK; return SIGAR_OK;
} }
@ -692,11 +692,11 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
return status; return status;
} }
cpu->user = SIGAR_TICK2SEC(data.cpu[CPU_USER]); cpu->user = SIGAR_TICK2MSEC(data.cpu[CPU_USER]);
cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */ cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */
cpu->sys = SIGAR_TICK2SEC(data.cpu[CPU_KERNEL]); cpu->sys = SIGAR_TICK2MSEC(data.cpu[CPU_KERNEL]);
cpu->idle = SIGAR_TICK2SEC(data.cpu[CPU_IDLE]); cpu->idle = SIGAR_TICK2MSEC(data.cpu[CPU_IDLE]);
cpu->wait = SIGAR_TICK2SEC(data.cpu[CPU_WAIT]); cpu->wait = SIGAR_TICK2MSEC(data.cpu[CPU_WAIT]);
cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait; cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait;
return SIGAR_OK; return SIGAR_OK;
@ -756,11 +756,11 @@ static int sigar_cpu_list_get_kmem(sigar_t *sigar, sigar_cpu_list_t *cpulist)
cpu = &cpulist->data[cpulist->number++]; cpu = &cpulist->data[cpulist->number++];
info = &sigar->cpuinfo[i]; info = &sigar->cpuinfo[i];
cpu->user = SIGAR_TICK2SEC(info->cpu[CPU_USER]); cpu->user = SIGAR_TICK2MSEC(info->cpu[CPU_USER]);
cpu->nice = 0; /* N/A */ cpu->nice = 0; /* N/A */
cpu->sys = SIGAR_TICK2SEC(info->cpu[CPU_KERNEL]); cpu->sys = SIGAR_TICK2MSEC(info->cpu[CPU_KERNEL]);
cpu->idle = SIGAR_TICK2SEC(info->cpu[CPU_IDLE]); cpu->idle = SIGAR_TICK2MSEC(info->cpu[CPU_IDLE]);
cpu->wait = SIGAR_TICK2SEC(info->cpu[CPU_WAIT]); cpu->wait = SIGAR_TICK2MSEC(info->cpu[CPU_WAIT]);
cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait; cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait;
} }
@ -791,11 +791,11 @@ static int sigar_cpu_list_get_pstat(sigar_t *sigar, sigar_cpu_list_t *cpulist)
} }
if (sigar->perfstat.cpu(&id, &data, sizeof(data), 1) == 1) { if (sigar->perfstat.cpu(&id, &data, sizeof(data), 1) == 1) {
cpu->user = SIGAR_TICK2SEC(data.user); cpu->user = SIGAR_TICK2MSEC(data.user);
cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */ cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */
cpu->sys = SIGAR_TICK2SEC(data.sys); cpu->sys = SIGAR_TICK2MSEC(data.sys);
cpu->idle = SIGAR_TICK2SEC(data.idle); cpu->idle = SIGAR_TICK2MSEC(data.idle);
cpu->wait = SIGAR_TICK2SEC(data.wait); cpu->wait = SIGAR_TICK2MSEC(data.wait);
cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait; cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait;
} }
else { else {

18
src/os/hpux/hpux_sigar.c
View File

@ -124,19 +124,19 @@ static void get_cpu_metrics(sigar_t *sigar,
sigar_cpu_t *cpu, sigar_cpu_t *cpu,
pstat_int_t *cpu_time) pstat_int_t *cpu_time)
{ {
cpu->user = SIGAR_TICK2SEC(cpu_time[CP_USER]); cpu->user = SIGAR_TICK2MSEC(cpu_time[CP_USER]);
cpu->sys = SIGAR_TICK2SEC(cpu_time[CP_SYS] + cpu->sys = SIGAR_TICK2MSEC(cpu_time[CP_SYS] +
cpu_time[CP_SSYS] + cpu_time[CP_SSYS] +
cpu_time[CP_INTR]); cpu_time[CP_INTR]);
cpu->nice = SIGAR_TICK2SEC(cpu_time[CP_NICE]); cpu->nice = SIGAR_TICK2MSEC(cpu_time[CP_NICE]);
cpu->idle = SIGAR_TICK2SEC(cpu_time[CP_IDLE]); cpu->idle = SIGAR_TICK2MSEC(cpu_time[CP_IDLE]);
cpu->wait = SIGAR_TICK2SEC(cpu_time[CP_WAIT] + cpu->wait = SIGAR_TICK2MSEC(cpu_time[CP_WAIT] +
cpu_time[CP_SWAIT] + cpu_time[CP_SWAIT] +
cpu_time[CP_BLOCK]); cpu_time[CP_BLOCK]);
cpu->total = cpu->total =
cpu->user + cpu->sys + cpu->nice + cpu->idle + cpu->wait; cpu->user + cpu->sys + cpu->nice + cpu->idle + cpu->wait;

10
src/os/linux/linux_sigar.c
View File

@ -423,13 +423,13 @@ static void get_cpu_metrics(sigar_t *sigar, sigar_cpu_t *cpu, char *line)
{ {
char *ptr = sigar_skip_token(line); /* "cpu%d" */ char *ptr = sigar_skip_token(line); /* "cpu%d" */
cpu->user += SIGAR_TICK2SEC(sigar_strtoull(ptr)); cpu->user += SIGAR_TICK2MSEC(sigar_strtoull(ptr));
cpu->nice += SIGAR_TICK2SEC(sigar_strtoull(ptr)); cpu->nice += SIGAR_TICK2MSEC(sigar_strtoull(ptr));
cpu->sys += SIGAR_TICK2SEC(sigar_strtoull(ptr)); cpu->sys += SIGAR_TICK2MSEC(sigar_strtoull(ptr));
cpu->idle += SIGAR_TICK2SEC(sigar_strtoull(ptr)); cpu->idle += SIGAR_TICK2MSEC(sigar_strtoull(ptr));
if (*ptr == ' ') { if (*ptr == ' ') {
/* 2.6+ kernels only */ /* 2.6+ kernels only */
cpu->wait += SIGAR_TICK2SEC(sigar_strtoull(ptr)); cpu->wait += SIGAR_TICK2MSEC(sigar_strtoull(ptr));
} }
cpu->total = cpu->user + cpu->nice + cpu->sys + cpu->idle + cpu->wait; cpu->total = cpu->user + cpu->nice + cpu->sys + cpu->idle + cpu->wait;
} }

8
src/os/solaris/solaris_sigar.c
View File

@ -434,10 +434,10 @@ int sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist)
SIGAR_ZERO(cpu); SIGAR_ZERO(cpu);
} }
cpu->user += SIGAR_TICK2SEC(cpuinfo[CPU_USER]); cpu->user += SIGAR_TICK2MSEC(cpuinfo[CPU_USER]);
cpu->sys += SIGAR_TICK2SEC(cpuinfo[CPU_KERNEL]); cpu->sys += SIGAR_TICK2MSEC(cpuinfo[CPU_KERNEL]);
cpu->idle += SIGAR_TICK2SEC(cpuinfo[CPU_IDLE]); cpu->idle += SIGAR_TICK2MSEC(cpuinfo[CPU_IDLE]);
cpu->wait += SIGAR_TICK2SEC(cpuinfo[CPU_WAIT]); cpu->wait += SIGAR_TICK2MSEC(cpuinfo[CPU_WAIT]);
cpu->nice += 0; /* no cpu->nice */ cpu->nice += 0; /* no cpu->nice */
cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait; cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait;
} }