picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pid1: properly encode infinity when writing CPUQuota snippet (#6141)

Browse source 
We would write
  [Slice]
  CPUQuota=1844674407370955%
which is (numerically) correct, but it seems better to just write
  [Slice]
  CPUQuota=
which is interpreted as USEC_INFINITY by the parser in config_parse_cpu_quota().

Fixes #5965.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-06-18 05:18:41 -04:00 committed by Lennart Poettering
parent f1fccf5322
commit d4bf82fcac
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/dbus-cgroup.c
View file

@ -407,7 +407,15 @@ int bus_cgroup_set_property(
if (mode != UNIT_CHECK) {
c->cpu_quota_per_sec_usec = u64;
unit_invalidate_cgroup(u, CGROUP_MASK_CPU);
unit_write_drop_in_private_format(u, mode, "CPUQuota", "CPUQuota=%0.f%%", (double) (c->cpu_quota_per_sec_usec / 10000));
if (c->cpu_quota_per_sec_usec == USEC_INFINITY)
unit_write_drop_in_private_format(u, mode, "CPUQuota",
"CPUQuota=");
else
/* config_parse_cpu_quota() requires an integer, so
* truncating division is used on purpose here. */
unit_write_drop_in_private_format(u, mode, "CPUQuota",
"CPUQuota=%0.f%%",
(double) (c->cpu_quota_per_sec_usec / 10000));
}
return 1;