cgroup: add support for memory.swap.current

In systemctl-show we only show current swap if ever swapped or non-zero. This
reduces the noise on swapless systems, that would otherwise always show a swap
value that never has the chance to become non-zero. It further reduces the
noise for services that never swapped.

1 files changed, 48 insertions, 6 deletions

diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index 4a110d1e24..03ff1401e0 100644
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -2778,6 +2778,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly t MemorySwapCurrent = ...;
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
@@ -3409,6 +3411,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
 
     <!--property MemoryPeak is not documented!-->
 
+    <!--property MemorySwapCurrent is not documented!-->
+
     <!--property MemorySwapPeak is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
@@ -4045,6 +4049,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryPeak"/>
 
+    <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapCurrent"/>
+
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
@@ -4845,6 +4851,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly t MemorySwapCurrent = ...;
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
@@ -5486,6 +5494,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
 
     <!--property MemoryPeak is not documented!-->
 
+    <!--property MemorySwapCurrent is not documented!-->
+
     <!--property MemorySwapPeak is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
@@ -6104,6 +6114,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryPeak"/>
 
+    <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapCurrent"/>
+
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
@@ -6778,6 +6790,8 @@ node /org/freedesktop/systemd1/unit/home_2emount {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly t MemorySwapCurrent = ...;
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
@@ -7347,6 +7361,8 @@ node /org/freedesktop/systemd1/unit/home_2emount {
 
     <!--property MemoryPeak is not documented!-->
 
+    <!--property MemorySwapCurrent is not documented!-->
+
     <!--property MemorySwapPeak is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
@@ -7879,6 +7895,8 @@ node /org/freedesktop/systemd1/unit/home_2emount {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryPeak"/>
 
+    <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapCurrent"/>
+
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
@@ -8676,6 +8694,8 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly t MemorySwapCurrent = ...;
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
@@ -9231,6 +9251,8 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
     <!--property MemoryPeak is not documented!-->
 
+    <!--property MemorySwapCurrent is not documented!-->
+
     <!--property MemorySwapPeak is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
@@ -9749,6 +9771,8 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryPeak"/>
 
+    <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapCurrent"/>
+
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
@@ -10405,6 +10429,8 @@ node /org/freedesktop/systemd1/unit/system_2eslice {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly t MemorySwapCurrent = ...;
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
@@ -10586,6 +10612,8 @@ node /org/freedesktop/systemd1/unit/system_2eslice {
 
     <!--property MemoryPeak is not documented!-->
 
+    <!--property MemorySwapCurrent is not documented!-->
+
     <!--property MemorySwapPeak is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
@@ -10768,6 +10796,8 @@ node /org/freedesktop/systemd1/unit/system_2eslice {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryPeak"/>
 
+    <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapCurrent"/>
+
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
@@ -10978,6 +11008,8 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly t MemorySwapCurrent = ...;
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
@@ -11179,6 +11211,8 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
 
     <!--property MemoryPeak is not documented!-->
 
+    <!--property MemorySwapCurrent is not documented!-->
+
     <!--property MemorySwapPeak is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
@@ -11391,6 +11425,8 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryPeak"/>
 
+    <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapCurrent"/>
+
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
@@ -11790,7 +11826,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <para><varname>NFTSet</varname>,
       <varname>SetLoginEnvironment</varname>,
       <varname>CoredumpReceive</varname>,
-      <varname>MemoryPeak</varname>, and
+      <varname>MemoryPeak</varname>,
+      <varname>MemorySwapCurrent</varname>, and
       <varname>MemorySwapPeak</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
@@ -11819,7 +11856,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>NFTSet</varname>,
       <varname>SetLoginEnvironment</varname>,
       <varname>CoredumpReceive</varname>,
-      <varname>MemoryPeak</varname>, and
+      <varname>MemoryPeak</varname>,
+      <varname>MemorySwapCurrent</varname>, and
       <varname>MemorySwapPeak</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
@@ -11846,7 +11884,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <para><varname>NFTSet</varname>,
       <varname>SetLoginEnvironment</varname>,
       <varname>CoredumpReceive</varname>,
-      <varname>MemoryPeak</varname>, and
+      <varname>MemoryPeak</varname>,
+      <varname>MemorySwapCurrent</varname>, and
       <varname>MemorySwapPeak</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
@@ -11873,7 +11912,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <para><varname>NFTSet</varname>,
       <varname>SetLoginEnvironment</varname>,
       <varname>CoredumpReceive</varname>,
-      <varname>MemoryPeak</varname>, and
+      <varname>MemoryPeak</varname>,
+      <varname>MemorySwapCurrent</varname>, and
       <varname>MemorySwapPeak</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
@@ -11891,7 +11931,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryPressureThresholdUSec</varname> were added in version 254.</para>
       <para><varname>NFTSet</varname>,
       <varname>CoredumpReceive</varname>,
-      <varname>MemoryPeak</varname>, and
+      <varname>MemoryPeak</varname>,
+      <varname>MemorySwapCurrent</varname>, and
       <varname>MemorySwapPeak</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
@@ -11910,7 +11951,8 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryPressureThresholdUSec</varname> were added in version 254.</para>
       <para><varname>NFTSet</varname>,
       <varname>CoredumpReceive</varname>,
-      <varname>MemoryPeak</varname>, and
+      <varname>MemoryPeak</varname>,
+      <varname>MemorySwapCurrent</varname>, and
       <varname>MemorySwapPeak</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>