daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
923a60
From 510ba7ebe71c8e4e64ead26a44b330d2e4375d9c Mon Sep 17 00:00:00 2001
923a60
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
923a60
Date: Thu, 26 Nov 2015 16:32:41 -0500
923a60
Subject: [PATCH] core: rename Random* to RandomizedDelay*
923a60
923a60
The name RandomSec is too generic: "Sec" just specifies the default
923a60
unit type, and "Random" by itself is not enough. Rename to something
923a60
that should give the user general idea what the setting does without
923a60
looking at documentation.
923a60
923a60
Cherry-picked from: 6f5d79986a9c98b9cacc83f865fed957e4e6e4e6
923a60
Resolves: #1305279
923a60
---
923a60
 man/systemd.timer.xml                 | 8 ++++----
923a60
 src/core/dbus-timer.c                 | 6 +++---
923a60
 src/core/load-fragment-gperf.gperf.m4 | 2 +-
923a60
 src/libsystemd/sd-bus/bus-util.c      | 6 +++---
923a60
 4 files changed, 11 insertions(+), 11 deletions(-)
923a60
923a60
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
923a60
index bdd14d8883..ab83b2c9cf 100644
923a60
--- a/man/systemd.timer.xml
923a60
+++ b/man/systemd.timer.xml
923a60
@@ -195,7 +195,7 @@
923a60
       </varlistentry>
923a60
 
923a60
       <varlistentry>
923a60
-        <term><varname>RandomSec=</varname></term>
923a60
+        <term><varname>RandomizedDelaySec=</varname></term>
923a60
 
923a60
         <listitem><para>Delay the timer by a randomly selected, evenly
923a60
         distributed amount of time between 0 and the specified time
923a60
@@ -212,16 +212,16 @@
923a60
         time range in order to minimize wakeups, the former does the
923a60
         opposite: it stretches timer events over a time range, to make
923a60
         it unlikely that they fire simultaneously. If
923a60
-        <varname>RandomSec=</varname> and
923a60
+        <varname>RandomizedDelaySec=</varname> and
923a60
         <varname>AccuracySec=</varname> are used in conjunction, first
923a60
         the a randomized time is added, and the result is then
923a60
         possibly shifted further to coalesce it with other timer
923a60
         events possibly happening on the system. As mentioned above
923a60
         <varname>AccuracySec=</varname> defaults to 1min and
923a60
-        <varname>RandomSec=</varname> to 0, thus encouraging
923a60
+        <varname>RandomizedDelaySec=</varname> to 0, thus encouraging
923a60
         coalescing of timer events. In order to optimally stretch
923a60
         timer events over a certain range of time, make sure to set
923a60
-        <varname>RandomSec=</varname> to a higher value, and
923a60
+        <varname>RandomizedDelaySec=</varname> to a higher value, and
923a60
         <varname>AccuracySec=1us</varname>.</para></listitem>
923a60
       </varlistentry>
923a60
 
923a60
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
923a60
index cd7bf44baa..478905accb 100644
923a60
--- a/src/core/dbus-timer.c
923a60
+++ b/src/core/dbus-timer.c
923a60
@@ -181,7 +181,7 @@ const sd_bus_vtable bus_timer_vtable[] = {
923a60
         BUS_PROPERTY_DUAL_TIMESTAMP("LastTriggerUSec", offsetof(Timer, last_trigger), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
923a60
         SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Timer, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
923a60
         SD_BUS_PROPERTY("AccuracyUSec", "t", bus_property_get_usec, offsetof(Timer, accuracy_usec), SD_BUS_VTABLE_PROPERTY_CONST),
923a60
-        SD_BUS_PROPERTY("RandomUSec", "t", bus_property_get_usec, offsetof(Timer, random_usec), SD_BUS_VTABLE_PROPERTY_CONST),
923a60
+        SD_BUS_PROPERTY("RandomizedDelayUSec", "t", bus_property_get_usec, offsetof(Timer, random_usec), SD_BUS_VTABLE_PROPERTY_CONST),
923a60
         SD_BUS_PROPERTY("Persistent", "b", bus_property_get_bool, offsetof(Timer, persistent), SD_BUS_VTABLE_PROPERTY_CONST),
923a60
         SD_BUS_PROPERTY("WakeSystem", "b", bus_property_get_bool, offsetof(Timer, wake_system), SD_BUS_VTABLE_PROPERTY_CONST),
923a60
         SD_BUS_VTABLE_END
923a60
@@ -285,7 +285,7 @@ static int bus_timer_set_transient_property(
923a60
 
923a60
                 return 1;
923a60
 
923a60
-        } else if (streq(name, "RandomUSec")) {
923a60
+        } else if (streq(name, "RandomizedDelayUSec")) {
923a60
                 usec_t u = 0;
923a60
 
923a60
                 r = sd_bus_message_read(message, "t", &u);
923a60
@@ -296,7 +296,7 @@ static int bus_timer_set_transient_property(
923a60
                         char time[FORMAT_TIMESPAN_MAX];
923a60
 
923a60
                         t->random_usec = u;
923a60
-                        unit_write_drop_in_private_format(UNIT(t), mode, name, "RandomSec=%s\n", format_timespan(time, sizeof(time), u, USEC_PER_MSEC));
923a60
+                        unit_write_drop_in_private_format(UNIT(t), mode, name, "RandomizedDelaySec=%s\n", format_timespan(time, sizeof(time), u, USEC_PER_MSEC));
923a60
                 }
923a60
 
923a60
                 return 1;
923a60
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
923a60
index 5106a98eec..85d9797514 100644
923a60
--- a/src/core/load-fragment-gperf.gperf.m4
923a60
+++ b/src/core/load-fragment-gperf.gperf.m4
923a60
@@ -336,7 +336,7 @@ Timer.OnUnitInactiveSec,         config_parse_timer,                 0,
923a60
 Timer.Persistent,                config_parse_bool,                  0,                             offsetof(Timer, persistent)
923a60
 Timer.WakeSystem,                config_parse_bool,                  0,                             offsetof(Timer, wake_system)
923a60
 Timer.AccuracySec,               config_parse_sec,                   0,                             offsetof(Timer, accuracy_usec)
923a60
-Timer.RandomSec,                 config_parse_sec,                   0,                             offsetof(Timer, random_usec)
923a60
+Timer.RandomizedDelaySec,        config_parse_sec,                   0,                             offsetof(Timer, random_usec)
923a60
 Timer.Unit,                      config_parse_trigger_unit,          0,                             0
923a60
 m4_dnl
923a60
 Path.PathExists,                 config_parse_path_spec,             0,                             0
923a60
diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
923a60
index 5ecb3bea42..3a918361b5 100644
923a60
--- a/src/libsystemd/sd-bus/bus-util.c
923a60
+++ b/src/libsystemd/sd-bus/bus-util.c
923a60
@@ -1364,14 +1364,14 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
923a60
                         return bus_log_create_error(r);
923a60
 
923a60
                 return 0;
923a60
-        } else if (streq(field, "RandomSec")) {
923a60
+        } else if (streq(field, "RandomizedDelaySec")) {
923a60
                 usec_t t;
923a60
 
923a60
                 r = parse_sec(eq, &t);
923a60
                 if (r < 0)
923a60
-                        return log_error_errno(r, "Failed to parse RandomSec= parameter: %s", eq);
923a60
+                        return log_error_errno(r, "Failed to parse RandomizedDelaySec= parameter: %s", eq);
923a60
 
923a60
-                r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, "RandomUSec");
923a60
+                r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, "RandomizedDelayUSec");
923a60
                 if (r < 0)
923a60
                         return bus_log_create_error(r);
923a60