External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

nodeinfo: Use nodeGetOnlineCPUBitmap() when parsing node

Browse Source 
No need to look up the online status of each CPU separately when we
can get all the information in one go.
This commit is contained in:
Andrea Bolognani 2015-07-20 18:37:28 +02:00 committed by Peter Krempa
parent b7b506475c
commit b909e9fb2c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nodeinfo.c
View File

@ -410,6 +410,7 @@ virNodeParseNode(const char *sysfs_prefix,
DIR *cpudir = NULL; DIR *cpudir = NULL;
struct dirent *cpudirent = NULL; struct dirent *cpudirent = NULL;
virBitmapPtr present_cpumap = NULL; virBitmapPtr present_cpumap = NULL;
virBitmapPtr online_cpus_map = NULL;
virBitmapPtr sockets_map = NULL; virBitmapPtr sockets_map = NULL;
virBitmapPtr *cores_maps = NULL; virBitmapPtr *cores_maps = NULL;
int sock_max = 0; int sock_max = 0;
@ -418,7 +419,6 @@ virNodeParseNode(const char *sysfs_prefix,
size_t i; size_t i;
int siblings; int siblings;
unsigned int cpu; unsigned int cpu;
int online;
int direrr; int direrr;
*threads = 0; *threads = 0;
@ -433,6 +433,9 @@ virNodeParseNode(const char *sysfs_prefix,
present_cpumap = nodeGetPresentCPUBitmap(sysfs_prefix); present_cpumap = nodeGetPresentCPUBitmap(sysfs_prefix);
if (!present_cpumap) if (!present_cpumap)
goto cleanup; goto cleanup;
online_cpus_map = nodeGetOnlineCPUBitmap(sysfs_prefix);
if (!online_cpus_map)
goto cleanup;
/* enumerate sockets in the node */ /* enumerate sockets in the node */
if (!(sockets_map = virBitmapNew(ID_MAX + 1))) if (!(sockets_map = virBitmapNew(ID_MAX + 1)))
@ -445,10 +448,7 @@ virNodeParseNode(const char *sysfs_prefix,
if (!virBitmapIsBitSet(present_cpumap, cpu)) if (!virBitmapIsBitSet(present_cpumap, cpu))
continue; continue;
if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) if (!virBitmapIsBitSet(online_cpus_map, cpu))
goto cleanup;
if (!online)
continue; continue;
/* Parse socket */ /* Parse socket */
@ -490,10 +490,7 @@ virNodeParseNode(const char *sysfs_prefix,
if (!virBitmapIsBitSet(present_cpumap, cpu)) if (!virBitmapIsBitSet(present_cpumap, cpu))
continue; continue;
if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) if (!virBitmapIsBitSet(online_cpus_map, cpu)) {
goto cleanup;
if (!online) {
(*offline)++; (*offline)++;
continue; continue;
} }
@ -561,6 +558,7 @@ virNodeParseNode(const char *sysfs_prefix,
virBitmapFree(cores_maps[i]); virBitmapFree(cores_maps[i]);
VIR_FREE(cores_maps); VIR_FREE(cores_maps);
virBitmapFree(sockets_map); virBitmapFree(sockets_map);
virBitmapFree(online_cpus_map);
virBitmapFree(present_cpumap); virBitmapFree(present_cpumap);
return ret; return ret;