External/libvirt
1
0
Fork 0
Code

util: numa: use VIR_AUTOPTR for aggregate types

Browse Source 
By making use of GNU C's cleanup attribute handled by the
VIR_AUTOPTR macro for declaring aggregate pointer variables,
majority of the calls to *Free functions can be dropped, which
in turn leads to getting rid of most of our cleanup sections.

Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Sukrit Bhatnagar 2018-07-28 23:31:40 +05:30 committed by Erik Skultety
parent 4a840ff681
commit d18a5f716a
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/util/virnuma.c
View File

@ -57,7 +57,7 @@ char *
virNumaGetAutoPlacementAdvice(unsigned short vcpus, virNumaGetAutoPlacementAdvice(unsigned short vcpus,
unsigned long long balloon) unsigned long long balloon)
{ {
virCommandPtr cmd = NULL; VIR_AUTOPTR(virCommand) cmd = NULL;
char *output = NULL; char *output = NULL;
cmd = virCommandNewArgList(NUMAD, "-w", NULL); cmd = virCommandNewArgList(NUMAD, "-w", NULL);
@ -71,7 +71,6 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus,
_("Failed to query numad for the " _("Failed to query numad for the "
"advisory nodeset")); "advisory nodeset"));
virCommandFree(cmd);
return output; return output;
} }
#else /* !HAVE_NUMAD */ #else /* !HAVE_NUMAD */
@ -252,41 +251,38 @@ int
virNumaGetNodeCPUs(int node, virNumaGetNodeCPUs(int node,
virBitmapPtr *cpus) virBitmapPtr *cpus)
{ {
virBitmapPtr cpumap = NULL;
int ncpus = 0; int ncpus = 0;
int max_n_cpus = virNumaGetMaxCPUs(); int max_n_cpus = virNumaGetMaxCPUs();
int mask_n_bytes = max_n_cpus / 8; int mask_n_bytes = max_n_cpus / 8;
size_t i; size_t i;
int ret = -1;
VIR_AUTOFREE(unsigned long *) mask = NULL; VIR_AUTOFREE(unsigned long *) mask = NULL;
VIR_AUTOFREE(unsigned long *) allonesmask = NULL; VIR_AUTOFREE(unsigned long *) allonesmask = NULL;
VIR_AUTOPTR(virBitmap) cpumap = NULL;
*cpus = NULL; *cpus = NULL;
if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof(*mask)) < 0) if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof(*mask)) < 0)
goto cleanup; return -1;
if (VIR_ALLOC_N(allonesmask, mask_n_bytes / sizeof(*mask)) < 0) if (VIR_ALLOC_N(allonesmask, mask_n_bytes / sizeof(*mask)) < 0)
goto cleanup; return -1;
memset(allonesmask, 0xff, mask_n_bytes); memset(allonesmask, 0xff, mask_n_bytes);
/* The first time this returns -1, ENOENT if node doesn't exist... */ /* The first time this returns -1, ENOENT if node doesn't exist... */
if (numa_node_to_cpus(node, mask, mask_n_bytes) < 0) { if (numa_node_to_cpus(node, mask, mask_n_bytes) < 0) {
VIR_WARN("NUMA topology for cell %d is not available, ignoring", node); VIR_WARN("NUMA topology for cell %d is not available, ignoring", node);
ret = -2; return -2;
goto cleanup;
} }
/* second, third... times it returns an all-1's mask */ /* second, third... times it returns an all-1's mask */
if (memcmp(mask, allonesmask, mask_n_bytes) == 0) { if (memcmp(mask, allonesmask, mask_n_bytes) == 0) {
VIR_DEBUG("NUMA topology for cell %d is invalid, ignoring", node); VIR_DEBUG("NUMA topology for cell %d is invalid, ignoring", node);
ret = -2; return -2;
goto cleanup;
} }
if (!(cpumap = virBitmapNew(max_n_cpus))) if (!(cpumap = virBitmapNew(max_n_cpus)))
goto cleanup; return -1;
for (i = 0; i < max_n_cpus; i++) { for (i = 0; i < max_n_cpus; i++) {
if (MASK_CPU_ISSET(mask, i)) { if (MASK_CPU_ISSET(mask, i)) {
@ -295,14 +291,8 @@ virNumaGetNodeCPUs(int node,
} }
} }
*cpus = cpumap; VIR_STEAL_PTR(*cpus, cpumap);
cpumap = NULL; return ncpus;
ret = ncpus;
cleanup:
virBitmapFree(cpumap);
return ret;
} }
# undef MASK_CPU_ISSET # undef MASK_CPU_ISSET
# undef n_bits # undef n_bits