X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemd%2Fsd-event.h;h=d17c68d51bc47a4d470aef22e79b172e16949b4c;hb=ed1d9d8147489c95859f436594ae837209c4907e;hp=d96852a76398009fb6fe68b97f53ccfd3821c8b3;hpb=9b364545435d2b65fcf73519b3064bb7c28093b7;p=elogind.git
diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h
index d96852a76..d17c68d51 100644
--- 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
@@ -22,11 +20,11 @@
along with systemd; If not, see .
***/
-#include
-#include
-#include
#include
#include
+#include
+#include
+#include
#include "_sd-common.h"
@@ -51,10 +49,13 @@ enum {
};
enum {
- SD_EVENT_PASSIVE,
+ SD_EVENT_INITIAL,
+ SD_EVENT_ARMED,
+ SD_EVENT_PENDING,
SD_EVENT_RUNNING,
SD_EVENT_EXITING,
- SD_EVENT_FINISHED
+ SD_EVENT_FINISHED,
+ SD_EVENT_PREPARING
};
enum {
@@ -68,7 +69,18 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata);
typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata);
typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata);
typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata);
+#if 1 /// elogind is musl-libc compatible, which has other guards for siginfo_t
+#if ( defined(__GLIBC__) \
+ && ( defined(__USE_POSIX199309) || defined(__USE_XOPEN_EXTENDED) ) ) \
+ || (!defined(__GLIBC__) \
+ && ( defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
+ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
+ || defined(_BSD_SOURCE) ) )
typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata);
+#else
+typedef void* sd_event_child_handler_t;
+#endif
+#endif // 1
int sd_event_default(sd_event **e);
@@ -79,49 +91,87 @@ sd_event* sd_event_unref(sd_event *e);
int sd_event_add_io(sd_event *e, sd_event_source **s, int fd, uint32_t events, sd_event_io_handler_t callback, void *userdata);
int sd_event_add_time(sd_event *e, sd_event_source **s, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata);
int sd_event_add_signal(sd_event *e, sd_event_source **s, int sig, sd_event_signal_handler_t callback, void *userdata);
+#if 0 /// UNNEEDED by elogind
int sd_event_add_child(sd_event *e, sd_event_source **s, pid_t pid, int options, sd_event_child_handler_t callback, void *userdata);
int sd_event_add_defer(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
+#endif // 0
int sd_event_add_post(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
int sd_event_add_exit(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata);
-int sd_event_run(sd_event *e, uint64_t timeout);
+int sd_event_prepare(sd_event *e);
+int sd_event_wait(sd_event *e, uint64_t usec);
+int sd_event_dispatch(sd_event *e);
+int sd_event_run(sd_event *e, uint64_t usec);
+#if 0 /// UNNEEDED by elogind
int sd_event_loop(sd_event *e);
+#endif // 0
int sd_event_exit(sd_event *e, int code);
+#if 0 /// UNNEEDED by elogind
int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec);
int sd_event_get_fd(sd_event *e);
+#endif // 0
int sd_event_get_state(sd_event *e);
+#if 0 /// UNNEEDED by elogind
int sd_event_get_tid(sd_event *e, pid_t *tid);
int sd_event_get_exit_code(sd_event *e, int *code);
+#endif // 0
int sd_event_set_watchdog(sd_event *e, int b);
+#if 0 /// UNNEEDED by elogind
int sd_event_get_watchdog(sd_event *e);
+#endif // 0
+int sd_event_get_iteration(sd_event *e, uint64_t *ret);
+#if 0 /// UNNEEDED by elogind
sd_event_source* sd_event_source_ref(sd_event_source *s);
+#endif // 0
sd_event_source* sd_event_source_unref(sd_event_source *s);
sd_event *sd_event_source_get_event(sd_event_source *s);
+#if 0 /// UNNEEDED by elogind
void* sd_event_source_get_userdata(sd_event_source *s);
void* sd_event_source_set_userdata(sd_event_source *s, void *userdata);
+#endif // 0
+int sd_event_source_set_description(sd_event_source *s, const char *description);
+#if 0 /// UNNEEDED by elogind
+int sd_event_source_get_description(sd_event_source *s, const char **description);
+#endif // 0
int sd_event_source_set_prepare(sd_event_source *s, sd_event_handler_t callback);
+#if 0 /// UNNEEDED by elogind
int sd_event_source_get_pending(sd_event_source *s);
int sd_event_source_get_priority(sd_event_source *s, int64_t *priority);
+#endif // 0
int sd_event_source_set_priority(sd_event_source *s, int64_t priority);
+#if 0 /// UNNEEDED by elogind
int sd_event_source_get_enabled(sd_event_source *s, int *enabled);
+#endif // 0
int sd_event_source_set_enabled(sd_event_source *s, int enabled);
+#if 0 /// UNNEEDED by elogind
int sd_event_source_get_io_fd(sd_event_source *s);
+#endif // 0
int sd_event_source_set_io_fd(sd_event_source *s, int fd);
+#if 0 /// UNNEEDED by elogind
int sd_event_source_get_io_events(sd_event_source *s, uint32_t* events);
+#endif // 0
int sd_event_source_set_io_events(sd_event_source *s, uint32_t events);
+#if 0 /// UNNEEDED by elogind
int sd_event_source_get_io_revents(sd_event_source *s, uint32_t* revents);
+#endif // 0
int sd_event_source_get_time(sd_event_source *s, uint64_t *usec);
int sd_event_source_set_time(sd_event_source *s, uint64_t usec);
+#if 0 /// UNNEEDED by elogind
int sd_event_source_get_time_accuracy(sd_event_source *s, uint64_t *usec);
int sd_event_source_set_time_accuracy(sd_event_source *s, uint64_t usec);
int sd_event_source_get_time_clock(sd_event_source *s, clockid_t *clock);
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
+
+/* 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;