chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v229: Add missing fixes from upstream [6/6] src/systemd
[elogind.git]
/
src
/
systemd
/
sd-event.h
diff --git
a/src/systemd/sd-event.h
b/src/systemd/sd-event.h
index 79269bcb3cc71c57fd6f3e16990fe658c44a4191..fd32ac85650b9ebae99a39674e2a149e0b921fba 100644
(file)
--- a/
src/systemd/sd-event.h
+++ b/
src/systemd/sd-event.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#ifndef foosdeventhfoo
#define foosdeventhfoo
#ifndef foosdeventhfoo
#define foosdeventhfoo
@@
-22,11
+20,11
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
-#include <sys/signalfd.h>
-#include <sys/epoll.h>
#include <inttypes.h>
#include <signal.h>
#include <inttypes.h>
#include <signal.h>
+#include <sys/epoll.h>
+#include <sys/signalfd.h>
+#include <sys/types.h>
#include "_sd-common.h"
#include "_sd-common.h"
@@
-56,7
+54,8
@@
enum {
SD_EVENT_PENDING,
SD_EVENT_RUNNING,
SD_EVENT_EXITING,
SD_EVENT_PENDING,
SD_EVENT_RUNNING,
SD_EVENT_EXITING,
- SD_EVENT_FINISHED
+ SD_EVENT_FINISHED,
+ SD_EVENT_PREPARING,
};
enum {
};
enum {
@@
-89,9
+88,9
@@
int sd_event_add_post(sd_event *e, sd_event_source **s, sd_event_handler_t callb
int sd_event_add_exit(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
int sd_event_prepare(sd_event *e);
int sd_event_add_exit(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
int sd_event_prepare(sd_event *e);
-int sd_event_wait(sd_event *e, uint64_t
timeout
);
+int sd_event_wait(sd_event *e, uint64_t
usec
);
int sd_event_dispatch(sd_event *e);
int sd_event_dispatch(sd_event *e);
-int sd_event_run(sd_event *e, uint64_t
timeout
);
+int sd_event_run(sd_event *e, uint64_t
usec
);
#if 0 /// UNNEEDED by elogind
int sd_event_loop(sd_event *e);
#endif // 0
#if 0 /// UNNEEDED by elogind
int sd_event_loop(sd_event *e);
#endif // 0
@@
-156,6
+155,10
@@
int sd_event_source_get_signal(sd_event_source *s);
int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid);
#endif // 0
int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid);
#endif // 0
+/* Define helpers so that __attribute__((cleanup(sd_event_unrefp))) and similar may be used. */
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_event, sd_event_unref);
+_SD_DEFINE_POINTER_CLEANUP_FUNC(sd_event_source, sd_event_source_unref);
+
_SD_END_DECLARATIONS;
#endif
_SD_END_DECLARATIONS;
#endif