chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5876445
)
Prep v225: Applying various fixes and changes to src/libelogind/sd-event that got...
author
Sven Eden
<yamakuzure@gmx.net>
Wed, 4 Jan 2017 05:40:46 +0000
(06:40 +0100)
committer
Sven Eden
<yamakuzure@gmx.net>
Tue, 14 Mar 2017 09:18:46 +0000
(10:18 +0100)
src/libelogind/sd-event/sd-event.c
patch
|
blob
|
history
diff --git
a/src/libelogind/sd-event/sd-event.c
b/src/libelogind/sd-event/sd-event.c
index 629f780323f788c3e0896b672274a49dd8602dcc..871ea8d60c2c1f5a26c28dea1015108bd159fdde 100644
(file)
--- a/
src/libelogind/sd-event/sd-event.c
+++ b/
src/libelogind/sd-event/sd-event.c
@@
-819,7
+819,7
@@
_public_ int sd_event_add_io(
int r;
assert_return(e, -EINVAL);
int r;
assert_return(e, -EINVAL);
- assert_return(fd >= 0, -E
INVAL
);
+ assert_return(fd >= 0, -E
BADF
);
assert_return(!(events & ~(EPOLLIN|EPOLLOUT|EPOLLRDHUP|EPOLLPRI|EPOLLERR|EPOLLHUP|EPOLLET)), -EINVAL);
assert_return(callback, -EINVAL);
assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
assert_return(!(events & ~(EPOLLIN|EPOLLOUT|EPOLLRDHUP|EPOLLPRI|EPOLLERR|EPOLLHUP|EPOLLET)), -EINVAL);
assert_return(callback, -EINVAL);
assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
@@
-1323,7
+1323,7
@@
_public_ int sd_event_source_set_io_fd(sd_event_source *s, int fd) {
int r;
assert_return(s, -EINVAL);
int r;
assert_return(s, -EINVAL);
- assert_return(fd >= 0, -E
INVAL
);
+ assert_return(fd >= 0, -E
BADF
);
assert_return(s->type == SOURCE_IO, -EDOM);
assert_return(!event_pid_changed(s->event), -ECHILD);
assert_return(s->type == SOURCE_IO, -EDOM);
assert_return(!event_pid_changed(s->event), -ECHILD);
@@
-2604,9
+2604,12
@@
_public_ int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec) {
assert_return(usec, -EINVAL);
assert_return(!event_pid_changed(e), -ECHILD);
assert_return(usec, -EINVAL);
assert_return(!event_pid_changed(e), -ECHILD);
- /* If we haven't run yet, just get the actual time */
- if (!dual_timestamp_is_set(&e->timestamp))
- return -ENODATA;
+ if (!dual_timestamp_is_set(&e->timestamp)) {
+ /* Implicitly fall back to now() if we never ran
+ * before and thus have no cached time. */
+ *usec = now(clock);
+ return 1;
+ }
switch (clock) {
switch (clock) {