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

fix cpu_list for older linux kernels

This commit is contained in:
Doug MacEachern 2004-07-01 21:57:26 +00:00
parent 6caf990fc8
commit b10a1a0c9e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,22 +289,21 @@ int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)
int sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist) int sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist)
{ {
FILE *fp; FILE *fp;
char buffer[BUFSIZ], *ptr; char buffer[BUFSIZ], cpu_total[BUFSIZ], *ptr;
int hthread = is_ht_enabled(sigar), i=0; int hthread = is_ht_enabled(sigar), i=0;
sigar_cpu_t *cpu;
if (!(fp = fopen(PROC_STAT, "r"))) { if (!(fp = fopen(PROC_STAT, "r"))) {
return errno; return errno;
} }
/* skip first line */ /* skip first line */
(void)fgets(buffer, sizeof(buffer), fp); (void)fgets(cpu_total, sizeof(cpu_total), fp);
sigar_cpu_list_create(cpulist); sigar_cpu_list_create(cpulist);
/* XXX: merge times of logical processors if hyperthreading */ /* XXX: merge times of logical processors if hyperthreading */
while ((ptr = fgets(buffer, sizeof(buffer), fp))) { while ((ptr = fgets(buffer, sizeof(buffer), fp))) {
sigar_cpu_t *cpu;
if (!strnEQ(ptr, "cpu", 3)) { if (!strnEQ(ptr, "cpu", 3)) {
break; break;
} }
@ -326,6 +325,13 @@ int sigar_cpu_list_get(sigar_t *sigar, sigar_cpu_list_t *cpulist)
fclose(fp); fclose(fp);
if (cpulist->number == 0) {
/* likely older kernel where cpu\d is not present */
cpu = &cpulist->data[cpulist->number++];
SIGAR_ZERO(cpu);
get_cpu_metrics(cpu, cpu_total);
}
return SIGAR_OK; return SIGAR_OK;
} }