Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00
Code Issues Releases Activity

Allow more than 9 CPUs for CPU stats (bug 2155500)

Browse Source
This commit is contained in:
Brenden Matthews 2008-12-07 15:34:46 -07:00
parent 6fab949926
commit 9345e2bb8f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2008-12-07
* Removing $freq_dyn and $freq_dyn_g due to license issues (see sf.net
tracker bug #2166612)
* Allow more than 9 CPUs for CPU stats (bug 2155500)
2008-12-06
* Switching from svn to git repository. The repo can be viewed from

9
src/conky.c
View File

@ -2840,12 +2840,17 @@ static struct text_object *construct_text_object(const char *s,
END OBJ(cached, INFO_BUFFERS)
END OBJ(cpu, INFO_CPU)
if (arg) {
if (strncmp(arg, "cpu", 3) == EQUAL && isdigit(arg[3])) {
if (strncmp(arg, "cpu", 4) == EQUAL && isdigit(arg[3]) && isdigit(arg[4])) {
obj->data.cpu_index = atoi(&arg[3]) * 10;
obj->data.cpu_index += atoi(&arg[4]);
arg += 5;
} else if (strncmp(arg, "cpu", 3) == EQUAL && isdigit(arg[3])) {
obj->data.cpu_index = atoi(&arg[3]);
arg += 4;
} else {
obj->data.cpu_index = 0;
}
DEBUG2("Adding info for CPU %d", obj->data.cpu_index);
} else {
obj->data.cpu_index = 0;
}
@ -2862,6 +2867,7 @@ static struct text_object *construct_text_object(const char *s,
scan_bar(arg, &obj->a, &obj->b);
obj->data.cpu_index = 0;
}
DEBUG2("Adding info for CPU %d", obj->data.cpu_index);
END OBJ(cpugraph, INFO_CPU)
char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
&obj->e, &obj->showaslog);
@ -2874,6 +2880,7 @@ static struct text_object *construct_text_object(const char *s,
}
free(buf);
}
DEBUG2("Adding info for CPU %d", obj->data.cpu_index);
END OBJ(loadgraph, INFO_LOADAVG)
char *buf = scan_graph(arg, &obj->a, &obj->b, &obj->c, &obj->d,
&obj->e, &obj->showaslog);