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

convert cpu times to seconds

This commit is contained in:
Doug MacEachern 2005-05-12 00:11:05 +00:00
parent b1b7d8b605
commit 6fed44d47c
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,7 @@ int sigar_os_open(sigar_t **sigar)
(*sigar)->kmem = kmem; (*sigar)->kmem = kmem;
(*sigar)->dmem = -1; (*sigar)->dmem = -1;
(*sigar)->pagesize = 0; (*sigar)->pagesize = 0;
(*sigar)->ticks = sysconf(_SC_CLK_TCK);
(*sigar)->boot_time = 0; (*sigar)->boot_time = 0;
(*sigar)->last_pid = -1; (*sigar)->last_pid = -1;
(*sigar)->pinfo = NULL; (*sigar)->pinfo = NULL;
@ -637,11 +638,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 = cpu_data.user; cpu->user = SIGAR_TICK2SEC(cpu_data.user);
cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */ cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */
cpu->sys = cpu_data.sys; cpu->sys = SIGAR_TICK2SEC(cpu_data.sys);
cpu->idle = cpu_data.idle; cpu->idle = SIGAR_TICK2SEC(cpu_data.idle);
cpu->wait = cpu_data.wait; cpu->wait = SIGAR_TICK2SEC(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;
} }
@ -656,14 +657,14 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
return status; return status;
} }
cpu->user = data.cpu[CPU_USER]; cpu->user = SIGAR_TICK2SEC(data.cpu[CPU_USER]);
cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */ cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */
cpu->sys = data.cpu[CPU_KERNEL]; cpu->sys = SIGAR_TICK2SEC(data.cpu[CPU_KERNEL]);
cpu->idle = data.cpu[CPU_IDLE]; cpu->idle = SIGAR_TICK2SEC(data.cpu[CPU_IDLE]);
cpu->total = 0; cpu->total = 0;
for (i=0; i<CPU_NTIMES; i++) { for (i=0; i<CPU_NTIMES; i++) {
cpu->total += data.cpu[i]; cpu->total += SIGAR_TICK2SEC(data.cpu[i]);
} }
return SIGAR_OK; return SIGAR_OK;
@ -723,14 +724,14 @@ 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 = info->cpu[CPU_USER]; cpu->user = SIGAR_TICK2SEC(info->cpu[CPU_USER]);
cpu->nice = 0; /* N/A */ cpu->nice = 0; /* N/A */
cpu->sys = info->cpu[CPU_KERNEL]; cpu->sys = SIGAR_TICK2SEC(info->cpu[CPU_KERNEL]);
cpu->idle = info->cpu[CPU_IDLE]; cpu->idle = SIGAR_TICK2SEC(info->cpu[CPU_IDLE]);
cpu->total = 0; cpu->total = 0;
for (j=0; j<CPU_NTIMES; j++) { for (j=0; j<CPU_NTIMES; j++) {
cpu->total += info->cpu[j]; cpu->total += SIGAR_TICK2SEC(info->cpu[j]);
} }
} }
@ -761,11 +762,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 = data.user; cpu->user = SIGAR_TICK2SEC(data.user);
cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */ cpu->nice = SIGAR_FIELD_NOTIMPL; /* N/A */
cpu->sys = data.sys; cpu->sys = SIGAR_TICK2SEC(data.sys);
cpu->idle = data.idle; cpu->idle = SIGAR_TICK2SEC(data.idle);
cpu->wait = data.wait; cpu->wait = SIGAR_TICK2SEC(data.wait);
cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait; cpu->total = cpu->user + cpu->sys + cpu->idle + cpu->wait;
} }
else { else {