diff options
| author | Mike Yuan <me@yhndnzj.com> | 2023-03-25 02:06:42 +0800 |
|---|---|---|
| committer | Mike Yuan <me@yhndnzj.com> | 2023-03-27 19:31:12 +0800 |
| commit | 57b33e0ce77171b8dbe926199be04a98efe1ae18 (patch) | |
| tree | 5d1a7f160d5c510f911fc61447e4d7ab99682389 | |
| parent | be1adc27fc61ba723bd0392199f7b82ef9f1c970 (diff) | |
| download | systemd-57b33e0ce77171b8dbe926199be04a98efe1ae18.tar.gz | |
core/dbus-service: add RestartUSecCurrent property
This new property shows how much time we actually
waits before restarting.
| -rw-r--r-- | man/org.freedesktop.systemd1.xml | 6 | ||||
| -rw-r--r-- | src/core/dbus-service.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index e7254ca305..ab94a90b7c 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -2567,6 +2567,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { readonly u RestartSteps = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t RestartUSecMax = ...; + @org.freedesktop.DBus.Property.EmitsChangedSignal("false") + readonly t RestartUSecCurrent = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t TimeoutStartUSec = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") @@ -3196,6 +3198,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <!--property RestartUSecMax is not documented!--> + <!--property RestartUSecCurrent is not documented!--> + <!--property TimeoutStartFailureMode is not documented!--> <!--property TimeoutStopFailureMode is not documented!--> @@ -3758,6 +3762,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <variablelist class="dbus-property" generated="True" extra-ref="RestartUSecMax"/> + <variablelist class="dbus-property" generated="True" extra-ref="RestartUSecCurrent"/> + <variablelist class="dbus-property" generated="True" extra-ref="TimeoutStartUSec"/> <variablelist class="dbus-property" generated="True" extra-ref="TimeoutStopUSec"/> diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 704e59cc60..ddfffe80fd 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -33,6 +33,7 @@ static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, service_result, Service static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_restart, service_restart, ServiceRestart); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_emergency_action, emergency_action, EmergencyAction); static BUS_DEFINE_PROPERTY_GET2(property_get_notify_access, "s", Service, service_get_notify_access, notify_access_to_string); +static BUS_DEFINE_PROPERTY_GET(property_get_restart_usec_current, "t", Service, service_restart_usec); static BUS_DEFINE_PROPERTY_GET(property_get_timeout_abort_usec, "t", Service, service_timeout_abort_usec); static BUS_DEFINE_PROPERTY_GET(property_get_watchdog_usec, "t", Service, service_get_watchdog_usec); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_timeout_failure_mode, service_timeout_failure_mode, ServiceTimeoutFailureMode); @@ -227,6 +228,7 @@ const sd_bus_vtable bus_service_vtable[] = { SD_BUS_PROPERTY("RestartUSec", "t", bus_property_get_usec, offsetof(Service, restart_usec), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("RestartSteps", "u", bus_property_get_unsigned, offsetof(Service, restart_steps), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("RestartUSecMax", "t", bus_property_get_usec, offsetof(Service, restart_usec_max), SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("RestartUSecCurrent", "t", property_get_restart_usec_current, 0, 0), SD_BUS_PROPERTY("TimeoutStartUSec", "t", bus_property_get_usec, offsetof(Service, timeout_start_usec), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("TimeoutStopUSec", "t", bus_property_get_usec, offsetof(Service, timeout_stop_usec), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("TimeoutAbortUSec", "t", property_get_timeout_abort_usec, 0, 0), |