From 9a0549093332880df47c4218209ce126b8586835 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 22 May 2014 11:53:12 +0900
Subject: 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.
---
 man/systemd-system.conf.xml      | 12 ------------
 man/systemd.resource-control.xml | 27 +++++----------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

(limited to 'man')

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
@@ -301,18 +301,6 @@
                                 above.</para></listitem>
                         </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>
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 &gt; 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 &gt; 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
@@ -164,20 +161,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </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>
 
-- 
cgit v1.2.3-54-g00ecf