shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-08-25 13:50:09 +03:00
Code Releases Activity

vircgroup: Introduce virCgroupControllerAvailable

Browse Source 
This new internal API checks if given CGroup controller is
available.  It is going to be needed later when we need to make a
decision whether pin domain memory onto NUMA nodes using cpuset
CGroup controller or using numa_set_membind().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik
2015-03-31 11:39:13 +02:00
parent cfcdf5ff01
commit d65acbde35
4 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -1142,6 +1142,7 @@ virCgroupAllowDevice;
virCgroupAllowDeviceMajor; virCgroupAllowDeviceMajor;
virCgroupAllowDevicePath; virCgroupAllowDevicePath;
virCgroupAvailable; virCgroupAvailable;
virCgroupControllerAvailable;
virCgroupControllerTypeFromString; virCgroupControllerTypeFromString;
virCgroupControllerTypeToString; virCgroupControllerTypeToString;
virCgroupDenyAllDevices; virCgroupDenyAllDevices;

19
src/util/vircgroup.c
View File

@ -4011,6 +4011,20 @@ virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller)
return ret; return ret;
} }
bool
virCgroupControllerAvailable(int controller)
{
virCgroupPtr cgroup;
bool ret = false;
if (virCgroupNewSelf(&cgroup) < 0)
return ret;
ret = virCgroupHasController(cgroup, controller);
virCgroupFree(&cgroup);
return ret;
}
#else /* !VIR_CGROUP_SUPPORTED */ #else /* !VIR_CGROUP_SUPPORTED */
bool bool
@ -4781,4 +4795,9 @@ virCgroupHasEmptyTasks(virCgroupPtr cgroup ATTRIBUTE_UNUSED,
return -1; return -1;
} }
bool
virCgroupControllerAvailable(int controller ATTRIBUTE_UNUSED)
{
return false;
}
#endif /* !VIR_CGROUP_SUPPORTED */ #endif /* !VIR_CGROUP_SUPPORTED */

1
src/util/vircgroup.h
View File

@ -282,4 +282,5 @@ int virCgroupSetOwner(virCgroupPtr cgroup,
int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
bool virCgroupControllerAvailable(int controller);
#endif /* __VIR_CGROUP_H__ */ #endif /* __VIR_CGROUP_H__ */

31
tests/vircgrouptest.c
View File

@ -586,6 +586,34 @@ static int testCgroupAvailable(const void *args)
return 0; return 0;
} }
static int testCgroupControllerAvailable(const void *args ATTRIBUTE_UNUSED)
{
int ret = 0;
# define CHECK_CONTROLLER(c, present) \
if ((present && !virCgroupControllerAvailable(c)) || \
(!present && virCgroupControllerAvailable(c))) { \
fprintf(stderr, present ? \
"Expected controller %s not available\n" : \
"Unexpected controller %s available\n", #c); \
ret = -1; \
}
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_CPU, true)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_CPUACCT, true)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_CPUSET, true)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_MEMORY, true)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_DEVICES, false)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_FREEZER, true)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_BLKIO, true)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_NET_CLS, false)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_PERF_EVENT, false)
CHECK_CONTROLLER(VIR_CGROUP_CONTROLLER_SYSTEMD, true)
# undef CHECK_CONTROLLER
return ret;
}
static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
{ {
virCgroupPtr cgroup = NULL; virCgroupPtr cgroup = NULL;
@ -886,6 +914,9 @@ mymain(void)
if (virtTestRun("Cgroup available", testCgroupAvailable, (void*)0x1) < 0) if (virtTestRun("Cgroup available", testCgroupAvailable, (void*)0x1) < 0)
ret = -1; ret = -1;
if (virtTestRun("Cgroup controller available", testCgroupControllerAvailable, NULL) < 0)
ret = -1;
if (virtTestRun("virCgroupGetBlkioIoServiced works", testCgroupGetBlkioIoServiced, NULL) < 0) if (virtTestRun("virCgroupGetBlkioIoServiced works", testCgroupGetBlkioIoServiced, NULL) < 0)
ret = -1; ret = -1;