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

proper return value check for perfstat functions

This commit is contained in:
Doug MacEachern 2004-07-19 21:33:18 +00:00
parent ffc18694f4
commit 1df568b4ef
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,7 +568,7 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
if (sigar_perfstat_init(sigar) == SIGAR_OK) { if (sigar_perfstat_init(sigar) == SIGAR_OK) {
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))) { if (sigar->perfstat.cpu_total(&cpu_data, sizeof(cpu_data)) == 1) {
cpu->user = cpu_data.user; cpu->user = cpu_data.user;
cpu->nice = -1; /* N/A */ cpu->nice = -1; /* N/A */
cpu->sys = cpu_data.sys; cpu->sys = cpu_data.sys;
@ -691,7 +691,7 @@ static int sigar_cpu_list_get_pstat(sigar_t *sigar, sigar_cpu_list_t *cpulist)
i, id.name); i, id.name);
} }
if (sigar->perfstat.cpu(&id, &data, sizeof(data), 1)) { if (sigar->perfstat.cpu(&id, &data, sizeof(data), 1) == 1) {
cpu->user = data.user; cpu->user = data.user;
cpu->nice = -1; /* N/A */ cpu->nice = -1; /* N/A */
cpu->sys = data.sys; cpu->sys = data.sys;
@ -700,8 +700,8 @@ static int sigar_cpu_list_get_pstat(sigar_t *sigar, sigar_cpu_list_t *cpulist)
} }
else { else {
sigar_log_printf(sigar, SIGAR_LOG_ERROR, sigar_log_printf(sigar, SIGAR_LOG_ERROR,
"cpu%d perfstat_cpu(%s) failed", "cpu%d perfstat_cpu(%s) failed: %s",
i, id.name); i, id.name, sigar_strerror(sigar, errno));
SIGAR_ZERO(cpu); SIGAR_ZERO(cpu);
} }
} }
@ -813,12 +813,17 @@ int sigar_loadavg_get(sigar_t *sigar,
sigar_log(sigar, SIGAR_LOG_DEBUG, sigar_log(sigar, SIGAR_LOG_DEBUG,
"[loadavg] using libperfstat"); "[loadavg] using libperfstat");
if (sigar->perfstat.cpu_total(&cpu_data, sizeof(cpu_data))) { if (sigar->perfstat.cpu_total(&cpu_data, sizeof(cpu_data)) == 1) {
for (i=0; i<3; i++) { for (i=0; i<3; i++) {
loadavg->loadavg[i] = FIXED_TO_DOUBLE(cpu_data.loadavg[i]); loadavg->loadavg[i] = FIXED_TO_DOUBLE(cpu_data.loadavg[i]);
} }
return SIGAR_OK; return SIGAR_OK;
} }
else {
sigar_log_printf(sigar, SIGAR_LOG_ERROR,
"perfstat_cpu_total failed: %s",
sigar_strerror(sigar, errno));
}
} }
sigar_log(sigar, SIGAR_LOG_DEBUG, sigar_log(sigar, SIGAR_LOG_DEBUG,
@ -1404,10 +1409,15 @@ static int sigar_get_cpu_mhz_perfstat(sigar_t *sigar)
perfstat_cpu_total_t data; perfstat_cpu_total_t data;
if (sigar_perfstat_init(sigar) == SIGAR_OK) { if (sigar_perfstat_init(sigar) == SIGAR_OK) {
if (sigar->perfstat.cpu_total(&data, sizeof(data))) { if (sigar->perfstat.cpu_total(&data, sizeof(data)) == 1) {
sigar->cpu_mhz = data.processorHZ / 1000000; sigar->cpu_mhz = data.processorHZ / 1000000;
return SIGAR_OK; return SIGAR_OK;
} }
else {
sigar_log_printf(sigar, SIGAR_LOG_ERROR,
"perfstat_cpu_total failed: %s",
sigar_strerror(sigar, errno));
}
} }
return ENOENT; return ENOENT;