mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
cgroup macros refactoring, part 2
- Convert virCgroupGet* to VIR_CGROUP_SUPPORTED - Convert virCgroup(Get|Set)FreezerState to VIR_CGROUP_SUPPORTED Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Roman Bogorodskiy
Eric Blake
parent
02f1fd41f6
commit
c419e9b51c
@ -57,7 +57,7 @@
|
||||
#define VIR_FROM_THIS VIR_FROM_CGROUP
|
||||
|
||||
#if defined(__linux__) && defined(HAVE_GETMNTENT_R) && \
|
||||
defined(_DIRENT_HAVE_D_TYPE)
|
||||
defined(_DIRENT_HAVE_D_TYPE) && defined(_SC_CLK_TCK)
|
||||
# define VIR_CGROUP_SUPPORTED
|
||||
#endif
|
||||
|
||||
@ -2605,33 +2605,6 @@ virCgroupSetCpuCfsQuota(virCgroupPtr group, long long cfs_quota)
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* virCgroupGetCpuCfsQuota:
|
||||
*
|
||||
* @group: The cgroup to get cpu.cfs_quota_us for
|
||||
* @cfs_quota: Pointer to the returned cpu bandwidth (in usecs) that this tg
|
||||
* will be allowed to consume over period
|
||||
*
|
||||
* Returns: 0 on success
|
||||
*/
|
||||
int
|
||||
virCgroupGetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota)
|
||||
{
|
||||
return virCgroupGetValueI64(group,
|
||||
VIR_CGROUP_CONTROLLER_CPU,
|
||||
"cpu.cfs_quota_us", cfs_quota);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage)
|
||||
{
|
||||
return virCgroupGetValueU64(group,
|
||||
VIR_CGROUP_CONTROLLER_CPUACCT,
|
||||
"cpuacct.usage", usage);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage)
|
||||
{
|
||||
@ -2640,85 +2613,6 @@ virCgroupGetCpuacctPercpuUsage(virCgroupPtr group, char **usage)
|
||||
}
|
||||
|
||||
|
||||
#ifdef _SC_CLK_TCK
|
||||
int
|
||||
virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user,
|
||||
unsigned long long *sys)
|
||||
{
|
||||
char *str;
|
||||
char *p;
|
||||
int ret = -1;
|
||||
static double scale = -1.0;
|
||||
|
||||
if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
|
||||
"cpuacct.stat", &str) < 0)
|
||||
return -1;
|
||||
|
||||
if (!(p = STRSKIP(str, "user ")) ||
|
||||
virStrToLong_ull(p, &p, 10, user) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("Cannot parse user stat '%s'"),
|
||||
p);
|
||||
goto cleanup;
|
||||
}
|
||||
if (!(p = STRSKIP(p, "\nsystem ")) ||
|
||||
virStrToLong_ull(p, NULL, 10, sys) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("Cannot parse sys stat '%s'"),
|
||||
p);
|
||||
goto cleanup;
|
||||
}
|
||||
/* times reported are in system ticks (generally 100 Hz), but that
|
||||
* rate can theoretically vary between machines. Scale things
|
||||
* into approximate nanoseconds. */
|
||||
if (scale < 0) {
|
||||
long ticks_per_sec = sysconf(_SC_CLK_TCK);
|
||||
if (ticks_per_sec == -1) {
|
||||
virReportSystemError(errno, "%s",
|
||||
_("Cannot determine system clock HZ"));
|
||||
goto cleanup;
|
||||
}
|
||||
scale = 1000000000.0 / ticks_per_sec;
|
||||
}
|
||||
*user *= scale;
|
||||
*sys *= scale;
|
||||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
VIR_FREE(str);
|
||||
return ret;
|
||||
}
|
||||
#else
|
||||
int
|
||||
virCgroupGetCpuacctStat(virCgroupPtr group ATTRIBUTE_UNUSED,
|
||||
unsigned long long *user ATTRIBUTE_UNUSED,
|
||||
unsigned long long *sys ATTRIBUTE_UNUSED)
|
||||
{
|
||||
virReportSystemError(ENOSYS, "%s",
|
||||
_("Control groups not supported on this platform"));
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
int
|
||||
virCgroupSetFreezerState(virCgroupPtr group, const char *state)
|
||||
{
|
||||
return virCgroupSetValueStr(group,
|
||||
VIR_CGROUP_CONTROLLER_FREEZER,
|
||||
"freezer.state", state);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetFreezerState(virCgroupPtr group, char **state)
|
||||
{
|
||||
return virCgroupGetValueStr(group,
|
||||
VIR_CGROUP_CONTROLLER_FREEZER,
|
||||
"freezer.state", state);
|
||||
}
|
||||
|
||||
|
||||
#ifdef VIR_CGROUP_SUPPORTED
|
||||
|
||||
int
|
||||
@ -3099,6 +2993,100 @@ virCgroupIdentifyRoot(virCgroupPtr group)
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* virCgroupGetCpuCfsQuota:
|
||||
*
|
||||
* @group: The cgroup to get cpu.cfs_quota_us for
|
||||
* @cfs_quota: Pointer to the returned cpu bandwidth (in usecs) that this tg
|
||||
* will be allowed to consume over period
|
||||
*
|
||||
* Returns: 0 on success
|
||||
*/
|
||||
int
|
||||
virCgroupGetCpuCfsQuota(virCgroupPtr group, long long *cfs_quota)
|
||||
{
|
||||
return virCgroupGetValueI64(group,
|
||||
VIR_CGROUP_CONTROLLER_CPU,
|
||||
"cpu.cfs_quota_us", cfs_quota);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage)
|
||||
{
|
||||
return virCgroupGetValueU64(group,
|
||||
VIR_CGROUP_CONTROLLER_CPUACCT,
|
||||
"cpuacct.usage", usage);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetCpuacctStat(virCgroupPtr group, unsigned long long *user,
|
||||
unsigned long long *sys)
|
||||
{
|
||||
char *str;
|
||||
char *p;
|
||||
int ret = -1;
|
||||
static double scale = -1.0;
|
||||
|
||||
if (virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPUACCT,
|
||||
"cpuacct.stat", &str) < 0)
|
||||
return -1;
|
||||
|
||||
if (!(p = STRSKIP(str, "user ")) ||
|
||||
virStrToLong_ull(p, &p, 10, user) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("Cannot parse user stat '%s'"),
|
||||
p);
|
||||
goto cleanup;
|
||||
}
|
||||
if (!(p = STRSKIP(p, "\nsystem ")) ||
|
||||
virStrToLong_ull(p, NULL, 10, sys) < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("Cannot parse sys stat '%s'"),
|
||||
p);
|
||||
goto cleanup;
|
||||
}
|
||||
/* times reported are in system ticks (generally 100 Hz), but that
|
||||
* rate can theoretically vary between machines. Scale things
|
||||
* into approximate nanoseconds. */
|
||||
if (scale < 0) {
|
||||
long ticks_per_sec = sysconf(_SC_CLK_TCK);
|
||||
if (ticks_per_sec == -1) {
|
||||
virReportSystemError(errno, "%s",
|
||||
_("Cannot determine system clock HZ"));
|
||||
goto cleanup;
|
||||
}
|
||||
scale = 1000000000.0 / ticks_per_sec;
|
||||
}
|
||||
*user *= scale;
|
||||
*sys *= scale;
|
||||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
VIR_FREE(str);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupSetFreezerState(virCgroupPtr group, const char *state)
|
||||
{
|
||||
return virCgroupSetValueStr(group,
|
||||
VIR_CGROUP_CONTROLLER_FREEZER,
|
||||
"freezer.state", state);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetFreezerState(virCgroupPtr group, char **state)
|
||||
{
|
||||
return virCgroupGetValueStr(group,
|
||||
VIR_CGROUP_CONTROLLER_FREEZER,
|
||||
"freezer.state", state);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupIsolateMount(virCgroupPtr group, const char *oldroot,
|
||||
const char *mountopts)
|
||||
@ -3228,6 +3216,67 @@ virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_UNUSED)
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED,
|
||||
long long *cfs_quota ATTRIBUTE_UNUSED)
|
||||
{
|
||||
virReportSystemError(ENOSYS, "%s",
|
||||
_("Control groups not supported on this platform"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetCpuacctUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
|
||||
unsigned long long *usage ATTRIBUTE_UNUSED)
|
||||
{
|
||||
virReportSystemError(ENOSYS, "%s",
|
||||
_("Control groups not supported on this platform"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetCpuacctPercpuUsage(virCgroupPtr group ATTRIBUTE_UNUSED,
|
||||
char **usage ATTRIBUTE_UNUSED)
|
||||
{
|
||||
virReportSystemError(ENOSYS, "%s",
|
||||
_("Control groups not supported on this platform"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetCpuacctStat(virCgroupPtr group ATTRIBUTE_UNUSED,
|
||||
unsigned long long *user ATTRIBUTE_UNUSED,
|
||||
unsigned long long *sys ATTRIBUTE_UNUSED)
|
||||
{
|
||||
virReportSystemError(ENOSYS, "%s",
|
||||
_("Control groups not supported on this platform"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupSetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED,
|
||||
const char *state ATTRIBUTE_UNUSED)
|
||||
{
|
||||
virReportSystemError(ENOSYS, "%s",
|
||||
_("Control groups not supported on this platform"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupGetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED,
|
||||
char **state ATTRIBUTE_UNUSED)
|
||||
{
|
||||
virReportSystemError(ENOSYS, "%s",
|
||||
_("Control groups not supported on this platform"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
virCgroupIsolateMount(virCgroupPtr group ATTRIBUTE_UNUSED,
|
||||
const char *oldroot ATTRIBUTE_UNUSED,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user