From b905dc7e59e2ac3362ef2c9c1fdb0ae3b0ddace3 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Mon, 25 Sep 2017 11:50:36 +0200 Subject: [PATCH] Prep v233.7: Make all supportable API functions visible (v233 addition). --- man/sd_event_source_unref.xml | 12 +++---- man/sd_notify.xml | 60 +++++++++++++++++------------------ man/sd_watchdog_enabled.xml | 6 ++-- src/basic/missing.h | 2 -- 4 files changed, 39 insertions(+), 41 deletions(-) diff --git a/man/sd_event_source_unref.xml b/man/sd_event_source_unref.xml index 279eab6bc..6bc122e1c 100644 --- a/man/sd_event_source_unref.xml +++ b/man/sd_event_source_unref.xml @@ -3,29 +3,29 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> sd_event_source_unref - systemd + elogind @@ -52,7 +52,7 @@ - #include <systemd/sd-event.h> + #include <elogind/sd-event.h> sd_event_source* sd_event_source_unref diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 856b1bcbc..a15426c1d 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -194,7 +194,7 @@ watchdog timestamp. This is the keep-alive ping that services need to issue in regular intervals if WatchdogSec= is enabled for it. See - systemd.service5 + elogind.service5 for information how to enable this functionality and sd_watchdog_enabled3 for the details of how the service can check whether the @@ -205,24 +205,25 @@ FDSTORE=1 - Stores additional file descriptors in the service manager. File descriptors sent this way will - be maintained per-service by the service manager and will later be handed back using the usual file descriptor - passing logic at the next invocation of the service, see - sd_listen_fds3. This is - useful for implementing services that can restart after an explicit request or a crash without losing - state. Any open sockets and other file descriptors which should not be closed during the restart may be stored - this way. Application state can either be serialized to a file in /run, or better, stored - in a memfd_create2 memory - file descriptor. Note that the service manager will accept messages for a service only if its - FileDescriptorStoreMax= setting is non-zero (defaults to zero, see - systemd.service5). If file - descriptors sent are pollable (see - epoll_ctl2), then any - EPOLLHUP or EPOLLERR event seen on them will result in their - automatic removal from the store. Multiple arrays of file descriptors may be sent in separate messages, in - which case the arrays are combined. Note that the service manager removes duplicate (pointing to the same - object) file descriptors before passing them to the service. Use sd_pid_notify_with_fds() - to send messages with FDSTORE=1, see below. + Stores additional file descriptors in the service manager. File + descriptors sent this way will be maintained per-service by the service manager + and will be passed again using the usual file descriptor passing logic on the next + invocation of the service, see + sd_listen_fds3. + This is useful for implementing service restart schemes where services serialize + their state to /run, push their file descriptors to the + system manager, and are then restarted, retrieving their state again via socket + passing and /run. Note that the service manager will accept + messages for a service only if FileDescriptorStoreMax= is set + to non-zero for it (defaults to zero, see + elogind.service5). + File descriptors must be pollable, see + epoll_ctl2. + Multiple arrays of file descriptors may be sent in separate messages, in which + case the arrays are combined. Note that the service manager removes duplicate + file descriptors before passing them to the service. Use + sd_pid_notify_with_fds() to send messages with + FDSTORE=1, see below. @@ -264,7 +265,7 @@ Note that elogind will accept status data sent from a service only if the NotifyAccess= option is correctly set in the service definition file. See - systemd.service5 + elogind.service5 for details. Note that sd_notify() notifications may be attributed to units correctly only if either @@ -311,14 +312,13 @@ Return Value - On failure, these calls return a negative errno-style error code. If $NOTIFY_SOCKET was - not set and hence no status message could be sent, 0 is returned. If the status was sent, these functions return a - positive value. In order to support both service managers that implement this scheme and those which do not, it is - generally recommended to ignore the return value of this call. Note that the return value simply indicates whether - the notification message was enqueued properly, it does not reflect whether the message could be processed - successfully. Specifically, no error is returned when a file descriptor is attempted to be stored using - FDSTORE=1 but the service is not actually configured to permit storing of file descriptors (see - above). + On failure, these calls return a negative errno-style error + code. If $NOTIFY_SOCKET was not set and hence + no status data could be sent, 0 is returned. If the status was + sent, these functions return with a positive return value. In + order to support both, init systems that implement this scheme and + those which do not, it is generally recommended to ignore the + return value of this call. @@ -401,13 +401,13 @@ See Also - systemd1, + elogind8, sd-daemon3, sd_listen_fds3, sd_listen_fds_with_names3, sd_watchdog_enabled3, daemon7, - systemd.service5 + elogind.service5 diff --git a/man/sd_watchdog_enabled.xml b/man/sd_watchdog_enabled.xml index 653f347eb..9ba70dd5c 100644 --- a/man/sd_watchdog_enabled.xml +++ b/man/sd_watchdog_enabled.xml @@ -96,7 +96,7 @@ To enable service supervision with the watchdog logic, use WatchdogSec= in service files. See - systemd.service5 + elogind.service5 for details. Use @@ -157,10 +157,10 @@ See Also - systemd1, + elogind8, sd-daemon3, daemon7, - systemd.service5, + elogind.service5, sd_notify3, sd_event_set_watchdog3 diff --git a/src/basic/missing.h b/src/basic/missing.h index 5c51fe250..c62c2db1c 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -55,7 +55,6 @@ #include #endif -#if 0 /// UNNEEDED by elogind #ifdef HAVE_LINUX_VM_SOCKETS_H #include #else @@ -72,7 +71,6 @@ struct sockaddr_vm { sizeof(unsigned int)]; }; #endif /* !HAVE_LINUX_VM_SOCKETS_H */ -#endif // 0 #ifndef RLIMIT_RTTIME #define RLIMIT_RTTIME 15 -- 2.30.2