External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-20 04:59:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Remove cbm_mask from virResctrlInfoPerType

Browse Source 
It was used just temporarily to do a calculation, no need to keep that around.
Also use virBitmap in the code instead of reimplementing two of its existing
functions.  And move the counting part next to where the value is read.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Martin Kletzander 2018-02-08 16:02:04 +01:00
parent f1d7625e13
commit 6142758a57
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/util/virresctrl.c
View File

@ -24,8 +24,6 @@
#include <fcntl.h> #include <fcntl.h>
#include "virresctrlpriv.h" #include "virresctrlpriv.h"
#include "c-ctype.h"
#include "count-one-bits.h"
#include "viralloc.h" #include "viralloc.h"
#include "virfile.h" #include "virfile.h"
#include "virlog.h" #include "virlog.h"
@ -97,7 +95,6 @@ static virClassPtr virResctrlAllocClass;
/* virResctrlInfo */ /* virResctrlInfo */
struct _virResctrlInfoPerType { struct _virResctrlInfoPerType {
/* Kernel-provided information */ /* Kernel-provided information */
char *cbm_mask;
unsigned int min_cbm_bits; unsigned int min_cbm_bits;
/* Our computed information from the above */ /* Our computed information from the above */
@ -142,11 +139,8 @@ virResctrlInfoDispose(void *obj)
continue; continue;
if (level->types) { if (level->types) {
for (j = 0; j < VIR_CACHE_TYPE_LAST; j++) { for (j = 0; j < VIR_CACHE_TYPE_LAST; j++)
if (level->types[j])
VIR_FREE(level->types[j]->cbm_mask);
VIR_FREE(level->types[j]); VIR_FREE(level->types[j]);
}
} }
VIR_FREE(level->types); VIR_FREE(level->types);
VIR_FREE(level); VIR_FREE(level);
@ -334,6 +328,7 @@ virResctrlGetInfo(virResctrlInfoPtr resctrl)
int type = 0; int type = 0;
struct dirent *ent = NULL; struct dirent *ent = NULL;
unsigned int level = 0; unsigned int level = 0;
virBitmapPtr tmp_map = NULL;
virResctrlInfoPerLevelPtr i_level = NULL; virResctrlInfoPerLevelPtr i_level = NULL;
virResctrlInfoPerTypePtr i_type = NULL; virResctrlInfoPerTypePtr i_type = NULL;
@ -378,7 +373,7 @@ virResctrlGetInfo(virResctrlInfoPtr resctrl)
goto cleanup; goto cleanup;
} }
rv = virFileReadValueString(&i_type->cbm_mask, rv = virFileReadValueString(&tmp_str,
SYSFS_RESCTRL_PATH SYSFS_RESCTRL_PATH
"/info/%s/cbm_mask", "/info/%s/cbm_mask",
ent->d_name); ent->d_name);
@ -393,7 +388,19 @@ virResctrlGetInfo(virResctrlInfoPtr resctrl)
if (rv < 0) if (rv < 0)
goto cleanup; goto cleanup;
virStringTrimOptionalNewline(i_type->cbm_mask); virStringTrimOptionalNewline(tmp_str);
tmp_map = virBitmapNewString(tmp_str);
VIR_FREE(tmp_str);
if (!tmp_map) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot parse cbm_mask from resctrl cache info"));
goto cleanup;
}
i_type->bits = virBitmapCountBits(tmp_map);
virBitmapFree(tmp_map);
tmp_map = NULL;
rv = virFileReadValueUint(&i_type->min_cbm_bits, rv = virFileReadValueUint(&i_type->min_cbm_bits,
SYSFS_RESCTRL_PATH "/info/%s/min_cbm_bits", SYSFS_RESCTRL_PATH "/info/%s/min_cbm_bits",
@ -431,24 +438,12 @@ virResctrlGetInfo(virResctrlInfoPtr resctrl)
goto cleanup; goto cleanup;
} }
for (tmp_str = i_type->cbm_mask; *tmp_str != '\0'; tmp_str++) {
if (!c_isxdigit(*tmp_str)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot parse cbm_mask from resctrl cache info"));
goto cleanup;
}
i_type->bits += count_one_bits(virHexToBin(*tmp_str));
}
VIR_STEAL_PTR(i_level->types[type], i_type); VIR_STEAL_PTR(i_level->types[type], i_type);
} }
ret = 0; ret = 0;
cleanup: cleanup:
VIR_DIR_CLOSE(dirp); VIR_DIR_CLOSE(dirp);
if (i_type)
VIR_FREE(i_type->cbm_mask);
VIR_FREE(i_type); VIR_FREE(i_type);
return ret; return ret;
} }