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

vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWeight

Browse Source 
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2018-09-24 12:20:19 +02:00
parent 44809a28ec
commit 8f50f9ca24
4 changed files with 71 additions and 33 deletions

36
src/util/vircgroup.c

@ -494,7 +494,7 @@ virCgroupGetValueStr(virCgroupPtr group,
}
static int
int
virCgroupGetValueForBlkDev(virCgroupPtr group,
int controller,
const char *key,
@ -1497,19 +1497,7 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
const char *path,
unsigned int weight)
{
VIR_AUTOFREE(char *) str = NULL;
VIR_AUTOFREE(char *) blkstr = NULL;
if (!(blkstr = virCgroupGetBlockDevString(path)))
return -1;
if (virAsprintf(&str, "%s%d", blkstr, weight) < 0)
return -1;
return virCgroupSetValueStr(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.weight_device",
str);
VIR_CGROUP_BACKEND_CALL(group, setBlkioDeviceWeight, -1, path, weight);
}
/**
@ -1661,25 +1649,7 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
const char *path,
unsigned int *weight)
{
VIR_AUTOFREE(char *) str = NULL;
if (virCgroupGetValueForBlkDev(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.weight_device",
path,
&str) < 0)
return -1;
if (!str) {
*weight = 0;
} else if (virStrToLong_ui(str, NULL, 10, weight) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to parse '%s' as an integer"),
str);
return -1;
}
return 0;
VIR_CGROUP_BACKEND_CALL(group, getBlkioDeviceWeight, -1, path, weight);
}

12
src/util/vircgroupbackend.h

@ -160,6 +160,16 @@ typedef int
long long *requests_read,
long long *requests_write);
typedef int
(*virCgroupSetBlkioDeviceWeightCB)(virCgroupPtr group,
const char *path,
unsigned int weight);
typedef int
(*virCgroupGetBlkioDeviceWeightCB)(virCgroupPtr group,
const char *path,
unsigned int *weight);
struct _virCgroupBackend {
virCgroupBackendType type;
@ -188,6 +198,8 @@ struct _virCgroupBackend {
virCgroupGetBlkioWeightCB getBlkioWeight;
virCgroupGetBlkioIoServicedCB getBlkioIoServiced;
virCgroupGetBlkioIoDeviceServicedCB getBlkioIoDeviceServiced;
virCgroupSetBlkioDeviceWeightCB setBlkioDeviceWeight;
virCgroupGetBlkioDeviceWeightCB getBlkioDeviceWeight;
};
typedef struct _virCgroupBackend virCgroupBackend;
typedef virCgroupBackend *virCgroupBackendPtr;

6
src/util/vircgrouppriv.h

@ -82,6 +82,12 @@ int virCgroupPartitionEscape(char **path);
char *virCgroupGetBlockDevString(const char *path);
int virCgroupGetValueForBlkDev(virCgroupPtr group,
int controller,
const char *key,
const char *path,
char **value);
int virCgroupNewPartition(const char *path,
bool create,
int controllers,

50
src/util/vircgroupv1.c

@ -1137,6 +1137,54 @@ virCgroupV1GetBlkioIoDeviceServiced(virCgroupPtr group,
}
static int
virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group,
const char *path,
unsigned int weight)
{
VIR_AUTOFREE(char *) str = NULL;
VIR_AUTOFREE(char *) blkstr = NULL;
if (!(blkstr = virCgroupGetBlockDevString(path)))
return -1;
if (virAsprintf(&str, "%s%d", blkstr, weight) < 0)
return -1;
return virCgroupSetValueStr(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.weight_device",
str);
}
static int
virCgroupV1GetBlkioDeviceWeight(virCgroupPtr group,
const char *path,
unsigned int *weight)
{
VIR_AUTOFREE(char *) str = NULL;
if (virCgroupGetValueForBlkDev(group,
VIR_CGROUP_CONTROLLER_BLKIO,
"blkio.weight_device",
path,
&str) < 0)
return -1;
if (!str) {
*weight = 0;
} else if (virStrToLong_ui(str, NULL, 10, weight) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to parse '%s' as an integer"),
str);
return -1;
}
return 0;
}
virCgroupBackend virCgroupV1Backend = {
.type = VIR_CGROUP_BACKEND_TYPE_V1,
@ -1163,6 +1211,8 @@ virCgroupBackend virCgroupV1Backend = {
.getBlkioWeight = virCgroupV1GetBlkioWeight,
.getBlkioIoServiced = virCgroupV1GetBlkioIoServiced,
.getBlkioIoDeviceServiced = virCgroupV1GetBlkioIoDeviceServiced,
.setBlkioDeviceWeight = virCgroupV1SetBlkioDeviceWeight,
.getBlkioDeviceWeight = virCgroupV1GetBlkioDeviceWeight,
};