summaryrefslogtreecommitdiff
path: root/src/core/dbus-cgroup.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-05-22 11:53:12 +0900
committerLennart Poettering <lennart@poettering.net>2014-05-22 11:53:12 +0900
commit9a0549093332880df47c4218209ce126b8586835 (patch)
tree3f929d8ef12b580f5c6ed91b7316bbbac4d4a299 /src/core/dbus-cgroup.c
parent609e002e78e79ef2bf9d6a6ea22bda215abbbb14 (diff)
cgroups: simplify CPUQuota= logic
Only accept cpu quota values in percentages, get rid of period definition. It's not clear whether the CFS period controllable per-cgroup even has a future in the kernel, hence let's simplify all this, hardcode the period to 100ms and only accept percentage based quota values.
Diffstat (limited to 'src/core/dbus-cgroup.c')
-rw-r--r--src/core/dbus-cgroup.c61
1 files changed, 1 insertions, 60 deletions
diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index ce7e55cb7f..eb7c2b9d27 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -133,24 +133,6 @@ static int property_get_device_allow(
return sd_bus_message_close_container(reply);
}
-static int property_get_cpu_quota_usec(
- sd_bus *bus,
- const char *path,
- const char *interface,
- const char *property,
- sd_bus_message *reply,
- void *userdata,
- sd_bus_error *error) {
-
- CGroupContext *c = userdata;
-
- assert(bus);
- assert(reply);
- assert(c);
-
- return sd_bus_message_append(reply, "t", cgroup_context_get_cpu_quota_usec(c));
-}
-
static int property_get_cpu_quota_per_sec_usec(
sd_bus *bus,
const char *path,
@@ -166,7 +148,7 @@ static int property_get_cpu_quota_per_sec_usec(
assert(reply);
assert(c);
- return sd_bus_message_append(reply, "t", cgroup_context_get_cpu_quota_per_sec_usec(c));
+ return sd_bus_message_append(reply, "t", c->cpu_quota_per_sec_usec);
}
static int property_get_ulong_as_u64(
@@ -193,8 +175,6 @@ const sd_bus_vtable bus_cgroup_vtable[] = {
SD_BUS_PROPERTY("CPUShares", "t", property_get_ulong_as_u64, offsetof(CGroupContext, cpu_shares), 0),
SD_BUS_PROPERTY("StartupCPUShares", "t", property_get_ulong_as_u64, offsetof(CGroupContext, startup_cpu_shares), 0),
SD_BUS_PROPERTY("CPUQuotaPerSecUSec", "t", property_get_cpu_quota_per_sec_usec, 0, 0),
- SD_BUS_PROPERTY("CPUQuotaUSec", "t", property_get_cpu_quota_usec, 0, 0),
- SD_BUS_PROPERTY("CPUQuotaPeriodUSec", "t", bus_property_get_usec, offsetof(CGroupContext, cpu_quota_period_usec), 0),
SD_BUS_PROPERTY("BlockIOAccounting", "b", bus_property_get_bool, offsetof(CGroupContext, blockio_accounting), 0),
SD_BUS_PROPERTY("BlockIOWeight", "t", property_get_ulong_as_u64, offsetof(CGroupContext, blockio_weight), 0),
SD_BUS_PROPERTY("StartupBlockIOWeight", "t", property_get_ulong_as_u64, offsetof(CGroupContext, startup_blockio_weight), 0),
@@ -298,51 +278,12 @@ int bus_cgroup_set_property(
if (mode != UNIT_CHECK) {
c->cpu_quota_per_sec_usec = u64;
- c->cpu_quota_usec = (uint64_t) -1;
u->cgroup_realized_mask &= ~CGROUP_CPU;
unit_write_drop_in_private_format(u, mode, "CPUQuota", "CPUQuota=%0.f%%", (double) (c->cpu_quota_per_sec_usec / 10000));
}
return 1;
- } else if (streq(name, "CPUQuotaUSec")) {
- uint64_t u64;
-
- r = sd_bus_message_read(message, "t", &u64);
- if (r < 0)
- return r;
-
- if (u64 <= 0)
- return sd_bus_error_set_errnof(error, EINVAL, "CPUQuotaUSec value out of range");
-
- if (mode != UNIT_CHECK) {
- c->cpu_quota_usec = u64;
- c->cpu_quota_per_sec_usec = (uint64_t) -1;
- u->cgroup_realized_mask &= ~CGROUP_CPU;
- unit_write_drop_in_private_format(u, mode, "CPUQuota", "CPUQuota=%" PRIu64 "us", u64);
- }
-
- return 1;
-
- } else if (streq(name, "CPUQuotaPeriodUSec")) {
-
- uint64_t u64;
-
- r = sd_bus_message_read(message, "t", &u64);
- if (r < 0)
- return r;
-
- if (u64 <= 0 || u64 >= (usec_t) -1)
- return sd_bus_error_set_errnof(error, EINVAL, "CPUQuotaPeriodUSec value out of range");
-
- if (mode != UNIT_CHECK) {
- c->cpu_quota_period_usec = u64;
- u->cgroup_realized_mask &= ~CGROUP_CPU;
- unit_write_drop_in_private_format(u, mode, name, "CPUQuotaPeriodSec=%" PRIu64 "us", c->cpu_quota_period_usec);
- }
-
- return 1;
-
} else if (streq(name, "BlockIOAccounting")) {
int b;