]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
projects / thirdparty / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ea288d)
core: rename MemoryZswapCurrent -> MemoryZSwapCurrent
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 13 Nov 2023 11:28:22 +0000 (20:28 +0900)
committerLennart Poettering <lennart@poettering.net>
Mon, 13 Nov 2023 12:54:56 +0000 (13:54 +0100)
Follow-up for 26caa66867ec921621df023654fc6a2186a21589.

man/org.freedesktop.systemd1.xml patch | blob | blame | history
src/core/dbus-unit.c patch | blob | blame | history
src/systemctl/systemctl-show.c patch | blob | blame | history

diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index 117f802a7a4e4fbc94e7ef479ea56dd6c1151c37..9d37e44d288462564cdc1eeab6e71ca9c046c600 100644 (file)
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -2782,7 +2782,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
-      readonly t MemoryZswapCurrent = ...;
+      readonly t MemoryZSwapCurrent = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
@@ -3417,7 +3417,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
 
     <!--property MemorySwapPeak is not documented!-->
 
-    <!--property MemoryZswapCurrent is not documented!-->
+    <!--property MemoryZSwapCurrent is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
 
@@ -4057,7 +4057,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZswapCurrent"/>
+    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZSwapCurrent"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
 
@@ -4861,7 +4861,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
-      readonly t MemoryZswapCurrent = ...;
+      readonly t MemoryZSwapCurrent = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
@@ -5506,7 +5506,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
 
     <!--property MemorySwapPeak is not documented!-->
 
-    <!--property MemoryZswapCurrent is not documented!-->
+    <!--property MemoryZSwapCurrent is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
 
@@ -6128,7 +6128,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZswapCurrent"/>
+    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZSwapCurrent"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
 
@@ -6806,7 +6806,7 @@ node /org/freedesktop/systemd1/unit/home_2emount {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
-      readonly t MemoryZswapCurrent = ...;
+      readonly t MemoryZSwapCurrent = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
@@ -7379,7 +7379,7 @@ node /org/freedesktop/systemd1/unit/home_2emount {
 
     <!--property MemorySwapPeak is not documented!-->
 
-    <!--property MemoryZswapCurrent is not documented!-->
+    <!--property MemoryZSwapCurrent is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
 
@@ -7915,7 +7915,7 @@ node /org/freedesktop/systemd1/unit/home_2emount {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZswapCurrent"/>
+    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZSwapCurrent"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
 
@@ -8716,7 +8716,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
-      readonly t MemoryZswapCurrent = ...;
+      readonly t MemoryZSwapCurrent = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
@@ -9275,7 +9275,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
     <!--property MemorySwapPeak is not documented!-->
 
-    <!--property MemoryZswapCurrent is not documented!-->
+    <!--property MemoryZSwapCurrent is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
 
@@ -9797,7 +9797,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZswapCurrent"/>
+    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZSwapCurrent"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
 
@@ -10457,7 +10457,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
-      readonly t MemoryZswapCurrent = ...;
+      readonly t MemoryZSwapCurrent = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
@@ -10642,7 +10642,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice {
 
     <!--property MemorySwapPeak is not documented!-->
 
-    <!--property MemoryZswapCurrent is not documented!-->
+    <!--property MemoryZSwapCurrent is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
 
@@ -10828,7 +10828,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZswapCurrent"/>
+    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZSwapCurrent"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
 
@@ -11042,7 +11042,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemorySwapPeak = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
-      readonly t MemoryZswapCurrent = ...;
+      readonly t MemoryZSwapCurrent = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
       readonly t MemoryAvailable = ...;
       @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
@@ -11247,7 +11247,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
 
     <!--property MemorySwapPeak is not documented!-->
 
-    <!--property MemoryZswapCurrent is not documented!-->
+    <!--property MemoryZSwapCurrent is not documented!-->
 
     <!--property CPUUsageNSec is not documented!-->
 
@@ -11463,7 +11463,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope {
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemorySwapPeak"/>
 
-    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZswapCurrent"/>
+    <variablelist class="dbus-property" generated="True" extra-ref="MemoryZSwapCurrent"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="MemoryAvailable"/>
 
@@ -11865,7 +11865,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryPeak</varname>,
       <varname>MemorySwapCurrent</varname>,
       <varname>MemorySwapPeak</varname>, and
-      <varname>MemoryZswapCurrent</varname> were added in version 255.</para>
+      <varname>MemoryZSwapCurrent</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
       <title>Socket Unit Objects</title>
@@ -11896,7 +11896,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryPeak</varname>,
       <varname>MemorySwapCurrent</varname>,
       <varname>MemorySwapPeak</varname>, and
-      <varname>MemoryZswapCurrent</varname> were added in version 255.</para>
+      <varname>MemoryZSwapCurrent</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
       <title>Mount Unit Objects</title>
@@ -11925,7 +11925,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryPeak</varname>,
       <varname>MemorySwapCurrent</varname>,
       <varname>MemorySwapPeak</varname>, and
-      <varname>MemoryZswapCurrent</varname> were added in version 255.</para>
+      <varname>MemoryZSwapCurrent</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
       <title>Swap Unit Objects</title>
@@ -11954,7 +11954,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryPeak</varname>,
       <varname>MemorySwapCurrent</varname>,
       <varname>MemorySwapPeak</varname>, and
-      <varname>MemoryZswapCurrent</varname> were added in version 255.</para>
+      <varname>MemoryZSwapCurrent</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
       <title>Slice Unit Objects</title>
@@ -11974,7 +11974,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryPeak</varname>,
       <varname>MemorySwapCurrent</varname>,
       <varname>MemorySwapPeak</varname>, and
-      <varname>MemoryZswapCurrent</varname> were added in version 255.</para>
+      <varname>MemoryZSwapCurrent</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
       <title>Scope Unit Objects</title>
@@ -11995,7 +11995,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \
       <varname>MemoryPeak</varname>,
       <varname>MemorySwapCurrent</varname>,
       <varname>MemorySwapPeak</varname>, and
-      <varname>MemoryZswapCurrent</varname> were added in version 255.</para>
+      <varname>MemoryZSwapCurrent</varname> were added in version 255.</para>
     </refsect2>
     <refsect2>
       <title>Job Objects</title>
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 2bd95f7bde6689cdf29d73bc1bb73d8fafa9029e..e5293269e3b71876f7d449aa45ff74f866c33ddc 100644 (file)
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -1631,7 +1631,7 @@ const sd_bus_vtable bus_unit_cgroup_vtable[] = {
         SD_BUS_PROPERTY("MemoryPeak", "t", property_get_peak_memory, 0, 0),
         SD_BUS_PROPERTY("MemorySwapCurrent", "t", property_get_current_swap_memory, 0, 0),
         SD_BUS_PROPERTY("MemorySwapPeak", "t", property_get_peak_swap_memory, 0, 0),
-        SD_BUS_PROPERTY("MemoryZswapCurrent", "t", property_get_current_zswap_memory, 0, 0),
+        SD_BUS_PROPERTY("MemoryZSwapCurrent", "t", property_get_current_zswap_memory, 0, 0),
         SD_BUS_PROPERTY("MemoryAvailable", "t", property_get_available_memory, 0, 0),
         SD_BUS_PROPERTY("CPUUsageNSec", "t", property_get_cpu_usage, 0, 0),
         SD_BUS_PROPERTY("EffectiveCPUs", "ay", property_get_cpuset_cpus, 0, 0),
diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c
index 1667ba4004dda4211caa866e51bc6c73baea742a..f6ffe3bfae1c66a7025975e8867b84b7cd37270a 100644 (file)
--- a/src/systemctl/systemctl-show.c
+++ b/src/systemctl/systemctl-show.c
@@ -2058,7 +2058,7 @@ static int show_one(
                 { "MemoryPeak",                     "t",               NULL,           offsetof(UnitStatusInfo, memory_peak)                       },
                 { "MemorySwapCurrent",              "t",               NULL,           offsetof(UnitStatusInfo, memory_swap_current)               },
                 { "MemorySwapPeak",                 "t",               NULL,           offsetof(UnitStatusInfo, memory_swap_peak)                  },
-                { "MemoryZswapCurrent",             "t",               NULL,           offsetof(UnitStatusInfo, memory_zswap_current)              },
+                { "MemoryZSwapCurrent",             "t",               NULL,           offsetof(UnitStatusInfo, memory_zswap_current)              },
                 { "MemoryAvailable",                "t",               NULL,           offsetof(UnitStatusInfo, memory_available)                  },
                 { "DefaultMemoryMin",               "t",               NULL,           offsetof(UnitStatusInfo, default_memory_min)                },
                 { "DefaultMemoryLow",               "t",               NULL,           offsetof(UnitStatusInfo, default_memory_low)                },
Unnamed repository; edit this file 'description' to name the repository.