diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-05-22 11:53:12 +0900 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-05-22 11:53:12 +0900 |
| commit | 9a0549093332880df47c4218209ce126b8586835 (patch) | |
| tree | 3f929d8ef12b580f5c6ed91b7316bbbac4d4a299 /man | |
| parent | 609e002e78e79ef2bf9d6a6ea22bda215abbbb14 (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 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 12 | ||||
| -rw-r--r-- | man/systemd.resource-control.xml | 27 |
2 files changed, 5 insertions, 34 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 3814bd2ad8..e2b2bd8b6f 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -302,18 +302,6 @@ </varlistentry> <varlistentry> - <term><varname>DefaultCPUQuotaPeriodSec=</varname></term> - - <listitem><para>Sets the default CPU - quota period. Defaults to 100ms. This - controls th global default for the - <varname>CPUQuotaPeriodSec=</varname> - setting of units, see - <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for details.</para></listitem> - </varlistentry> - - <varlistentry> <term><varname>DefaultTimeoutStartSec=</varname></term> <term><varname>DefaultTimeoutStopSec=</varname></term> <term><varname>DefaultRestartSec=</varname></term> diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index a1f63dd66b..e0e49db7d1 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -143,14 +143,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <listitem> <para>Assign the specified CPU time quota to the processes - executed. Takes a percentage value (suffixed with "%") or an - absolute time (suffixed by one of the common time units, us, - ms, s, ...). The percentage specifies how much CPU time the - unit shall get at maximum, relative to the total CPU time - available on one CPU. Use values > 100% for alloting CPU - time on more than one CPU. If an absolute time is specified - the processes of this unit will get this much absolute time - within each quota period, at maximum. This controls the + executed. Takes a percentage value, suffixed with "%". The + percentage specifies how much CPU time the unit shall get at + maximum, relative to the total CPU time available on one + CPU. Use values > 100% for alloting CPU time on more than + one CPU. This controls the <literal>cpu.cfs_quota_us</literal> control group attribute. For details about this control group attribute, see <ulink @@ -165,20 +162,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. </varlistentry> <varlistentry> - <term><varname>CPUQuotaPeriodSec=</varname></term> - - <listitem> - <para>Specify the CPU quota period to use. Defaults to - 100ms. This controls the <literal>cpu.cfs_period_us</literal> - control group attribute. For details about this control - group attribute, see <ulink - url="https://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt">sched-design-CFS.txt</ulink>.</para> - - <para>Implies <literal>CPUAccounting=true</literal>.</para> - </listitem> - </varlistentry> - - <varlistentry> <term><varname>MemoryAccounting=</varname></term> <listitem> |