openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vircgroup: extract virCgroupV1(Set|Get)CpuCfsQuota 

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-08-17 16:22:56 +02:00
parent c840448ebb
commit 5436fd75d8
4 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/vircgroup.c
View File

@ -555,7 +555,7 @@ virCgroupSetValueI64(virCgroupPtr group,
}
static int
int
virCgroupGetValueI64(virCgroupPtr group,
int controller,
const char *key,
@ -2254,19 +2254,7 @@ virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_period)
int
virCgroupSetCpuCfsQuota(virCgroupPtr group, long long cfs_quota)
{
/* The cfs_quota should be greater or equal than 1ms */
if (cfs_quota >= 0 &&
(cfs_quota < 1000 ||
cfs_quota > ULLONG_MAX / 1000)) {
virReportError(VIR_ERR_INVALID_ARG,
_("cfs_quota '%lld' must be in range (1000, %llu)"),
cfs_quota, ULLONG_MAX / 1000);
return -1;
}
return virCgroupSetValueI64(group,
VIR_CGROUP_CONTROLLER_CPU,
"cpu.cfs_quota_us", cfs_quota);
VIR_CGROUP_BACKEND_CALL(group, setCpuCfsQuota, -1, cfs_quota);
}
@ -2590,9 +2578,7 @@ virCgroupKillPainfully(virCgroupPtr group)
int
virCgroupGetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota)
{
return virCgroupGetValueI64(group,
VIR_CGROUP_CONTROLLER_CPU,
"cpu.cfs_quota_us", cfs_quota);
VIR_CGROUP_BACKEND_CALL(group, getCpuCfsQuota, -1, cfs_quota);
}

10
src/util/vircgroupbackend.h
View File

@ -292,6 +292,14 @@ typedef int
(*virCgroupGetCpuCfsPeriodCB)(virCgroupPtr group,
unsigned long long *cfs_period);
typedef int
(*virCgroupSetCpuCfsQuotaCB)(virCgroupPtr group,
long long cfs_quota);
typedef int
(*virCgroupGetCpuCfsQuotaCB)(virCgroupPtr group,
long long *cfs_quota);
struct _virCgroupBackend {
virCgroupBackendType type;
@ -351,6 +359,8 @@ struct _virCgroupBackend {
virCgroupGetCpuSharesCB getCpuShares;
virCgroupSetCpuCfsPeriodCB setCpuCfsPeriod;
virCgroupGetCpuCfsPeriodCB getCpuCfsPeriod;
virCgroupSetCpuCfsQuotaCB setCpuCfsQuota;
virCgroupGetCpuCfsQuotaCB getCpuCfsQuota;
};
typedef struct _virCgroupBackend virCgroupBackend;
typedef virCgroupBackend *virCgroupBackendPtr;

5
src/util/vircgrouppriv.h
View File

@ -78,6 +78,11 @@ int virCgroupSetValueI64(virCgroupPtr group,
const char *key,
long long int value);
int virCgroupGetValueI64(virCgroupPtr group,
int controller,
const char *key,
long long int *value);
int virCgroupPartitionEscape(char **path);
char *virCgroupGetBlockDevString(const char *path);

32
src/util/vircgroupv1.c
View File

@ -1815,6 +1815,36 @@ virCgroupV1GetCpuCfsPeriod(virCgroupPtr group,
}
static int
virCgroupV1SetCpuCfsQuota(virCgroupPtr group,
long long cfs_quota)
{
/* The cfs_quota should be greater or equal than 1ms */
if (cfs_quota >= 0 &&
(cfs_quota < 1000 ||
cfs_quota > ULLONG_MAX / 1000)) {
virReportError(VIR_ERR_INVALID_ARG,
_("cfs_quota '%lld' must be in range (1000, %llu)"),
cfs_quota, ULLONG_MAX / 1000);
return -1;
}
return virCgroupSetValueI64(group,
VIR_CGROUP_CONTROLLER_CPU,
"cpu.cfs_quota_us", cfs_quota);
}
static int
virCgroupV1GetCpuCfsQuota(virCgroupPtr group,
long long *cfs_quota)
{
return virCgroupGetValueI64(group,
VIR_CGROUP_CONTROLLER_CPU,
"cpu.cfs_quota_us", cfs_quota);
}
virCgroupBackend virCgroupV1Backend = {
.type = VIR_CGROUP_BACKEND_TYPE_V1,
@ -1872,6 +1902,8 @@ virCgroupBackend virCgroupV1Backend = {
.getCpuShares = virCgroupV1GetCpuShares,
.setCpuCfsPeriod = virCgroupV1SetCpuCfsPeriod,
.getCpuCfsPeriod = virCgroupV1GetCpuCfsPeriod,
.setCpuCfsQuota = virCgroupV1SetCpuCfsQuota,
.getCpuCfsQuota = virCgroupV1GetCpuCfsQuota,
};