dont reconvert for cpu total

This commit is contained in:
Doug MacEachern 2005-05-12 00:15:27 +00:00
parent fe1ed25bd1
commit 2299b02202
1 changed files with 2 additions and 10 deletions

View File

@ -662,11 +662,7 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
cpu->sys = SIGAR_TICK2SEC(data.cpu[CPU_KERNEL]); cpu->sys = SIGAR_TICK2SEC(data.cpu[CPU_KERNEL]);
cpu->idle = SIGAR_TICK2SEC(data.cpu[CPU_IDLE]); cpu->idle = SIGAR_TICK2SEC(data.cpu[CPU_IDLE]);
cpu->wait = SIGAR_TICK2SEC(data.cpu[CPU_WAIT]); cpu->wait = SIGAR_TICK2SEC(data.cpu[CPU_WAIT]);
cpu->total = 0; cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait;
for (i=0; i<CPU_NTIMES; i++) {
cpu->total += SIGAR_TICK2SEC(data.cpu[i]);
}
return SIGAR_OK; return SIGAR_OK;
} }
@ -729,11 +725,7 @@ static int sigar_cpu_list_get_kmem(sigar_t *sigar, sigar_cpu_list_t *cpulist)
cpu->nice = 0; /* N/A */ cpu->nice = 0; /* N/A */
cpu->sys = SIGAR_TICK2SEC(info->cpu[CPU_KERNEL]); cpu->sys = SIGAR_TICK2SEC(info->cpu[CPU_KERNEL]);
cpu->idle = SIGAR_TICK2SEC(info->cpu[CPU_IDLE]); cpu->idle = SIGAR_TICK2SEC(info->cpu[CPU_IDLE]);
cpu->total = 0; cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait;
for (j=0; j<CPU_NTIMES; j++) {
cpu->total += SIGAR_TICK2SEC(info->cpu[j]);
}
} }
return SIGAR_OK; return SIGAR_OK;