From: Yu Watanabe Date: Mon, 13 Nov 2023 11:28:22 +0000 (+0900) Subject: core: rename MemoryZswapCurrent -> MemoryZSwapCurrent X-Git-Tag: v255-rc2~34 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58cde42f65cabd2f1c37ee72b123d8d417ec6227;p=thirdparty%2Fsystemd.git core: rename MemoryZswapCurrent -> MemoryZSwapCurrent Follow-up for 26caa66867ec921621df023654fc6a2186a21589. --- diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 117f802a7a4..9d37e44d288 100644 --- 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 { - + @@ -4057,7 +4057,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { - + @@ -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 { - + @@ -6128,7 +6128,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2esocket { - + @@ -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 { - + @@ -7915,7 +7915,7 @@ node /org/freedesktop/systemd1/unit/home_2emount { - + @@ -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 { - + @@ -9797,7 +9797,7 @@ node /org/freedesktop/systemd1/unit/dev_2dsda3_2eswap { - + @@ -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 { - + @@ -10828,7 +10828,7 @@ node /org/freedesktop/systemd1/unit/system_2eslice { - + @@ -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 { - + @@ -11463,7 +11463,7 @@ node /org/freedesktop/systemd1/unit/session_2d1_2escope { - + @@ -11865,7 +11865,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \ MemoryPeak, MemorySwapCurrent, MemorySwapPeak, and - MemoryZswapCurrent were added in version 255. + MemoryZSwapCurrent were added in version 255. Socket Unit Objects @@ -11896,7 +11896,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \ MemoryPeak, MemorySwapCurrent, MemorySwapPeak, and - MemoryZswapCurrent were added in version 255. + MemoryZSwapCurrent were added in version 255. Mount Unit Objects @@ -11925,7 +11925,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \ MemoryPeak, MemorySwapCurrent, MemorySwapPeak, and - MemoryZswapCurrent were added in version 255. + MemoryZSwapCurrent were added in version 255. Swap Unit Objects @@ -11954,7 +11954,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \ MemoryPeak, MemorySwapCurrent, MemorySwapPeak, and - MemoryZswapCurrent were added in version 255. + MemoryZSwapCurrent were added in version 255. Slice Unit Objects @@ -11974,7 +11974,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \ MemoryPeak, MemorySwapCurrent, MemorySwapPeak, and - MemoryZswapCurrent were added in version 255. + MemoryZSwapCurrent were added in version 255. Scope Unit Objects @@ -11995,7 +11995,7 @@ $ gdbus introspect --system --dest org.freedesktop.systemd1 \ MemoryPeak, MemorySwapCurrent, MemorySwapPeak, and - MemoryZswapCurrent were added in version 255. + MemoryZSwapCurrent were added in version 255. Job Objects diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 2bd95f7bde6..e5293269e3b 100644 --- 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 1667ba4004d..f6ffe3bfae1 100644 --- 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) },