mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-23 13:05:27 +00:00
linuxNodeGetCPUStats: Correctly handle cpu prefix
To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function simply uses STRPREFIX() to match the cpuid with the one read from /proc/stat. However, as the file is read line by line it may happen, that some CPUs share the same prefix. So if user requested stats for the first CPU, which is offline, then there's no cpu1 in the stats file so the one that we match is cpu10. Which is obviously wrong. Fortunately, the IDs are terminated by a space, so we can utilize that. Signed-off-by: Bing Bu Cao <mars@linux.vnet.ibm.com>
This commit is contained in:
parent
9d6f26e57c
commit
94f8205359
@ -708,9 +708,9 @@ linuxNodeGetCPUStats(FILE *procstat,
|
||||
}
|
||||
|
||||
if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) {
|
||||
strcpy(cpu_header, "cpu");
|
||||
strcpy(cpu_header, "cpu ");
|
||||
} else {
|
||||
snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum);
|
||||
snprintf(cpu_header, sizeof(cpu_header), "cpu%d ", cpuNum);
|
||||
}
|
||||
|
||||
while (fgets(line, sizeof(line), procstat) != NULL) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user