X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-cgroup.c;h=db998345eb3eaddb0d21974cc2b52b9f42448afb;hb=a2c0e528b8b5ba370527db279605e4e4135689c1;hp=e9bdabf93189293b510965718586855238e8d3ce;hpb=b2f8b02ec27dfec9cbd23573f47aba494f2e9b5f;p=elogind.git diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c index e9bdabf93..db998345e 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -133,7 +133,7 @@ static int property_get_device_allow( return sd_bus_message_close_container(reply); } -static int property_get_cpu_quota_usec( +static int property_get_ulong_as_u64( sd_bus *bus, const char *path, const char *interface, @@ -142,42 +142,25 @@ static int property_get_cpu_quota_usec( 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, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) { - - CGroupContext *c = userdata; + unsigned long *ul = userdata; assert(bus); assert(reply); - assert(c); + assert(ul); - return sd_bus_message_append(reply, "t", cgroup_context_get_cpu_quota_per_sec_usec(c)); + return sd_bus_message_append(reply, "t", *ul == (unsigned long) -1 ? (uint64_t) -1 : (uint64_t) *ul); } const sd_bus_vtable bus_cgroup_vtable[] = { SD_BUS_VTABLE_START(0), + SD_BUS_PROPERTY("Delegate", "b", bus_property_get_bool, offsetof(CGroupContext, delegate), 0), SD_BUS_PROPERTY("CPUAccounting", "b", bus_property_get_bool, offsetof(CGroupContext, cpu_accounting), 0), - SD_BUS_PROPERTY("CPUShares", "t", bus_property_get_ulong, offsetof(CGroupContext, 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("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", bus_property_get_usec, offsetof(CGroupContext, cpu_quota_per_sec_usec), 0), SD_BUS_PROPERTY("BlockIOAccounting", "b", bus_property_get_bool, offsetof(CGroupContext, blockio_accounting), 0), - SD_BUS_PROPERTY("BlockIOWeight", "t", bus_property_get_ulong, offsetof(CGroupContext, blockio_weight), 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), SD_BUS_PROPERTY("BlockIODeviceWeight", "a(st)", property_get_blockio_device_weight, 0, 0), SD_BUS_PROPERTY("BlockIOReadBandwidth", "a(st)", property_get_blockio_device_bandwidths, 0, 0), SD_BUS_PROPERTY("BlockIOWriteBandwidth", "a(st)", property_get_blockio_device_bandwidths, 0, 0), @@ -188,6 +171,39 @@ const sd_bus_vtable bus_cgroup_vtable[] = { SD_BUS_VTABLE_END }; +static int bus_cgroup_set_transient_property( + Unit *u, + CGroupContext *c, + const char *name, + sd_bus_message *message, + UnitSetPropertiesMode mode, + sd_bus_error *error) { + + int r; + + assert(u); + assert(c); + assert(name); + assert(message); + + if (streq(name, "Delegate")) { + int b; + + r = sd_bus_message_read(message, "b", &b); + if (r < 0) + return r; + + if (mode != UNIT_CHECK) { + c->delegate = b; + unit_write_drop_in_private(u, mode, name, b ? "Delegate=yes" : "Delegate=no"); + } + + return 1; + } + + return 0; +} + int bus_cgroup_set_property( Unit *u, CGroupContext *c, @@ -226,9 +242,13 @@ int bus_cgroup_set_property( if (r < 0) return r; - ul = (unsigned long) u64; - if (ul <= 0 || (uint64_t) ul != u64) - return sd_bus_error_set_errnof(error, EINVAL, "CPUShares value out of range"); + if (u64 == (uint64_t) -1) + ul = (unsigned long) -1; + else { + ul = (unsigned long) u64; + if (ul <= 0 || (uint64_t) ul != u64) + return sd_bus_error_set_errnof(error, EINVAL, "CPUShares value out of range"); + } if (mode != UNIT_CHECK) { c->cpu_shares = ul; @@ -238,26 +258,31 @@ int bus_cgroup_set_property( return 1; - } else if (streq(name, "CPUQuotaPerSecUSec")) { + } else if (streq(name, "StartupCPUShares")) { uint64_t u64; + unsigned long ul; r = sd_bus_message_read(message, "t", &u64); if (r < 0) return r; - if (u64 <= 0) - return sd_bus_error_set_errnof(error, EINVAL, "CPUQuotaPerSecUSec value out of range"); + if (u64 == (uint64_t) -1) + ul = (unsigned long) -1; + else { + ul = (unsigned long) u64; + if (ul <= 0 || (uint64_t) ul != u64) + return sd_bus_error_set_errnof(error, EINVAL, "StartupCPUShares value out of range"); + } if (mode != UNIT_CHECK) { - c->cpu_quota_per_sec_usec = u64; - c->cpu_quota_usec = (uint64_t) -1; + c->startup_cpu_shares = ul; 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)); + unit_write_drop_in_private_format(u, mode, name, "StartupCPUShares=%lu", ul); } return 1; - } else if (streq(name, "CPUQuotaUSec")) { + } else if (streq(name, "CPUQuotaPerSecUSec")) { uint64_t u64; r = sd_bus_message_read(message, "t", &u64); @@ -265,52 +290,56 @@ int bus_cgroup_set_property( return r; if (u64 <= 0) - return sd_bus_error_set_errnof(error, EINVAL, "CPUQuotaUSec value out of range"); + return sd_bus_error_set_errnof(error, EINVAL, "CPUQuotaPerSecUSec value out of range"); if (mode != UNIT_CHECK) { - c->cpu_quota_usec = u64; - c->cpu_quota_per_sec_usec = (uint64_t) -1; + c->cpu_quota_per_sec_usec = u64; u->cgroup_realized_mask &= ~CGROUP_CPU; - unit_write_drop_in_private_format(u, mode, "CPUQuota", "CPUQuota=%" PRIu64 "us", u64); + 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, "CPUQuotaPeriodUSec")) { - - uint64_t u64; + } else if (streq(name, "BlockIOAccounting")) { + int b; - r = sd_bus_message_read(message, "t", &u64); + r = sd_bus_message_read(message, "b", &b); 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); + c->blockio_accounting = b; + u->cgroup_realized_mask &= ~CGROUP_BLKIO; + unit_write_drop_in_private(u, mode, name, b ? "BlockIOAccounting=yes" : "BlockIOAccounting=no"); } return 1; - } else if (streq(name, "BlockIOAccounting")) { - int b; + } else if (streq(name, "BlockIOWeight")) { + uint64_t u64; + unsigned long ul; - r = sd_bus_message_read(message, "b", &b); + r = sd_bus_message_read(message, "t", &u64); if (r < 0) return r; + if (u64 == (uint64_t) -1) + ul = (unsigned long) -1; + else { + ul = (unsigned long) u64; + if (ul < 10 || ul > 1000) + return sd_bus_error_set_errnof(error, EINVAL, "BlockIOWeight value out of range"); + } + if (mode != UNIT_CHECK) { - c->blockio_accounting = b; + c->blockio_weight = ul; u->cgroup_realized_mask &= ~CGROUP_BLKIO; - unit_write_drop_in_private(u, mode, name, b ? "BlockIOAccounting=yes" : "BlockIOAccounting=no"); + unit_write_drop_in_private_format(u, mode, name, "BlockIOWeight=%lu", ul); } return 1; - } else if (streq(name, "BlockIOWeight")) { + } else if (streq(name, "StartupBlockIOWeight")) { uint64_t u64; unsigned long ul; @@ -318,14 +347,18 @@ int bus_cgroup_set_property( if (r < 0) return r; - ul = (unsigned long) u64; - if (ul < 10 || ul > 1000) - return sd_bus_error_set_errnof(error, EINVAL, "BlockIOWeight value out of range"); + if (u64 == (uint64_t) -1) + ul = (unsigned long) -1; + else { + ul = (unsigned long) u64; + if (ul < 10 || ul > 1000) + return sd_bus_error_set_errnof(error, EINVAL, "StartupBlockIOWeight value out of range"); + } if (mode != UNIT_CHECK) { - c->blockio_weight = ul; + c->startup_blockio_weight = ul; u->cgroup_realized_mask &= ~CGROUP_BLKIO; - unit_write_drop_in_private_format(u, mode, name, "BlockIOWeight=%lu", ul); + unit_write_drop_in_private_format(u, mode, name, "StartupBlockIOWeight=%lu", ul); } return 1; @@ -633,6 +666,14 @@ int bus_cgroup_set_property( } return 1; + + } + + if (u->transient && u->load_state == UNIT_STUB) { + r = bus_cgroup_set_transient_property(u, c, name, message, mode, error); + if (r != 0) + return r; + } return 0;