External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 03:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Make virProcessGetAffinity more readable and fix coverity warning

Browse Source 
Store the cpu count in an intermediate variable and reuse it rather than
caluclating the index.

Additionally add a coverity silencing comment.
This commit is contained in:
Peter Krempa 2015-06-04 14:13:15 +02:00
parent b6a2639bd2
commit b0d2e31c5f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/virprocess.c
View File

@ -474,12 +474,14 @@ virProcessGetAffinity(pid_t pid)
size_t i;
cpu_set_t *mask;
size_t masklen;
size_t ncpus;
virBitmapPtr ret = NULL;
# ifdef CPU_ALLOC
/* 262144 cpus ought to be enough for anyone */
masklen = CPU_ALLOC_SIZE(1024 << 8);
mask = CPU_ALLOC(1024 << 8);
ncpus = 1024 << 8;
masklen = CPU_ALLOC_SIZE(ncpus);
mask = CPU_ALLOC(ncpus);
if (!mask) {
virReportOOMError();
@ -488,6 +490,7 @@ virProcessGetAffinity(pid_t pid)
CPU_ZERO_S(masklen, mask);
# else
ncpus = 1024;
if (VIR_ALLOC(mask) < 0)
return NULL;
@ -501,11 +504,12 @@ virProcessGetAffinity(pid_t pid)
goto cleanup;
}
if (!(ret = virBitmapNew(masklen * 8)))
if (!(ret = virBitmapNew(ncpus)))
goto cleanup;
for (i = 0; i < masklen * 8; i++) {
for (i = 0; i < ncpus; i++) {
# ifdef CPU_ALLOC
/* coverity[overrun-local] */
if (CPU_ISSET_S(i, masklen, mask))
ignore_value(virBitmapSetBit(ret, i));
# else