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 v228: Add remaining updates from upstream (3/3)
[elogind.git]
/
src
/
libelogind
/
sd-event
/
sd-event.c
diff --git
a/src/libelogind/sd-event/sd-event.c
b/src/libelogind/sd-event/sd-event.c
index bb5905fea16be8c0e70989d16b5d2ba9c26e61e3..d26efb8289fde67e2370a3f7a30c9cb40d144d51 100644
(file)
--- a/
src/libelogind/sd-event/sd-event.c
+++ b/
src/libelogind/sd-event/sd-event.c
@@
-23,19
+23,23
@@
#include <sys/timerfd.h>
#include <sys/wait.h>
#include <sys/timerfd.h>
#include <sys/wait.h>
-#include "sd-id128.h"
#include "sd-daemon.h"
#include "sd-daemon.h"
-#include "macro.h"
-#include "prioq.h"
+#include "sd-event.h"
+#include "sd-id128.h"
+
+#include "alloc-util.h"
+#include "fd-util.h"
#include "hashmap.h"
#include "hashmap.h"
-#include "
util
.h"
-#include "
time-util
.h"
+#include "
list
.h"
+#include "
macro
.h"
#include "missing.h"
#include "missing.h"
+#include "prioq.h"
+#include "process-util.h"
#include "set.h"
#include "set.h"
-#include "list.h"
#include "signal-util.h"
#include "signal-util.h"
-
-#include "sd-event.h"
+#include "string-util.h"
+#include "time-util.h"
+#include "util.h"
#define DEFAULT_ACCURACY_USEC (250 * USEC_PER_MSEC)
#define DEFAULT_ACCURACY_USEC (250 * USEC_PER_MSEC)
@@
-242,12
+246,6
@@
static int pending_prioq_compare(const void *a, const void *b) {
if (x->pending_iteration > y->pending_iteration)
return 1;
if (x->pending_iteration > y->pending_iteration)
return 1;
- /* Stability for the rest */
- if (x < y)
- return -1;
- if (x > y)
- return 1;
-
return 0;
}
return 0;
}
@@
-277,12
+275,6
@@
static int prepare_prioq_compare(const void *a, const void *b) {
if (x->priority > y->priority)
return 1;
if (x->priority > y->priority)
return 1;
- /* Stability for the rest */
- if (x < y)
- return -1;
- if (x > y)
- return 1;
-
return 0;
}
return 0;
}
@@
-310,12
+302,6
@@
static int earliest_time_prioq_compare(const void *a, const void *b) {
if (x->time.next > y->time.next)
return 1;
if (x->time.next > y->time.next)
return 1;
- /* Stability for the rest */
- if (x < y)
- return -1;
- if (x > y)
- return 1;
-
return 0;
}
return 0;
}
@@
-343,12
+329,6
@@
static int latest_time_prioq_compare(const void *a, const void *b) {
if (x->time.next + x->time.accuracy > y->time.next + y->time.accuracy)
return 1;
if (x->time.next + x->time.accuracy > y->time.next + y->time.accuracy)
return 1;
- /* Stability for the rest */
- if (x < y)
- return -1;
- if (x > y)
- return 1;
-
return 0;
}
return 0;
}
@@
-370,12
+350,6
@@
static int exit_prioq_compare(const void *a, const void *b) {
if (x->priority > y->priority)
return 1;
if (x->priority > y->priority)
return 1;
- /* Stability for the rest */
- if (x < y)
- return -1;
- if (x > y)
- return 1;
-
return 0;
}
return 0;
}
@@
-838,7
+812,7
@@
static void source_disconnect(sd_event_source *s) {
s->event->n_enabled_child_sources--;
}
s->event->n_enabled_child_sources--;
}
- (void) hashmap_remove(s->event->child_sources,
INT
_TO_PTR(s->child.pid));
+ (void) hashmap_remove(s->event->child_sources,
PID
_TO_PTR(s->child.pid));
event_gc_signal_data(s->event, &s->priority, SIGCHLD);
}
event_gc_signal_data(s->event, &s->priority, SIGCHLD);
}
@@
-1156,8
+1130,8
@@
_public_ int sd_event_add_signal(
callback = signal_exit_callback;
r = pthread_sigmask(SIG_SETMASK, NULL, &ss);
callback = signal_exit_callback;
r = pthread_sigmask(SIG_SETMASK, NULL, &ss);
- if (r
<
0)
- return -
errno
;
+ if (r
!=
0)
+ return -
r
;
if (!sigismember(&ss, sig))
return -EBUSY;
if (!sigismember(&ss, sig))
return -EBUSY;
@@
-1195,6
+1169,8
@@
_public_ int sd_event_add_signal(
return 0;
}
return 0;
}
+/// UNNEEDED by elogind
+#if 0
_public_ int sd_event_add_child(
sd_event *e,
sd_event_source **ret,
_public_ int sd_event_add_child(
sd_event *e,
sd_event_source **ret,
@@
-1218,7
+1194,7
@@
_public_ int sd_event_add_child(
if (r < 0)
return r;
if (r < 0)
return r;
- if (hashmap_contains(e->child_sources,
INT
_TO_PTR(pid)))
+ if (hashmap_contains(e->child_sources,
PID
_TO_PTR(pid)))
return -EBUSY;
s = source_new(e, !ret, SOURCE_CHILD);
return -EBUSY;
s = source_new(e, !ret, SOURCE_CHILD);
@@
-1231,7
+1207,7
@@
_public_ int sd_event_add_child(
s->userdata = userdata;
s->enabled = SD_EVENT_ONESHOT;
s->userdata = userdata;
s->enabled = SD_EVENT_ONESHOT;
- r = hashmap_put(e->child_sources,
INT
_TO_PTR(pid), s);
+ r = hashmap_put(e->child_sources,
PID
_TO_PTR(pid), s);
if (r < 0) {
source_free(s);
return r;
if (r < 0) {
source_free(s);
return r;
@@
-1287,6
+1263,7
@@
_public_ int sd_event_add_defer(
return 0;
}
return 0;
}
+#endif // 0
_public_ int sd_event_add_post(
sd_event *e,
_public_ int sd_event_add_post(
sd_event *e,
@@
-2729,6
+2706,8
@@
_public_ int sd_event_get_state(sd_event *e) {
return e->state;
}
return e->state;
}
+/// UNNEEDED by elogind
+#if 0
_public_ int sd_event_get_exit_code(sd_event *e, int *code) {
assert_return(e, -EINVAL);
assert_return(code, -EINVAL);
_public_ int sd_event_get_exit_code(sd_event *e, int *code) {
assert_return(e, -EINVAL);
assert_return(code, -EINVAL);
@@
-2740,6
+2719,7
@@
_public_ int sd_event_get_exit_code(sd_event *e, int *code) {
*code = e->exit_code;
return 0;
}
*code = e->exit_code;
return 0;
}
+#endif // 0
_public_ int sd_event_exit(sd_event *e, int code) {
assert_return(e, -EINVAL);
_public_ int sd_event_exit(sd_event *e, int code) {
assert_return(e, -EINVAL);
@@
-2813,6
+2793,8
@@
_public_ int sd_event_default(sd_event **ret) {
return 1;
}
return 1;
}
+/// UNNEEDED by elogind
+#if 0
_public_ int sd_event_get_tid(sd_event *e, pid_t *tid) {
assert_return(e, -EINVAL);
assert_return(tid, -EINVAL);
_public_ int sd_event_get_tid(sd_event *e, pid_t *tid) {
assert_return(e, -EINVAL);
assert_return(tid, -EINVAL);
@@
-2825,6
+2807,7
@@
_public_ int sd_event_get_tid(sd_event *e, pid_t *tid) {
return -ENXIO;
}
return -ENXIO;
}
+#endif // 0
_public_ int sd_event_set_watchdog(sd_event *e, int b) {
int r;
_public_ int sd_event_set_watchdog(sd_event *e, int b) {
int r;