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 (from parent 1:
def9a7a
)
sd-event: fix missing needs_rearm
author
Tom Gundersen
<teg@jklm.no>
Fri, 15 Aug 2014 16:21:18 +0000
(18:21 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Fri, 15 Aug 2014 18:20:38 +0000
(20:20 +0200)
src/libsystemd/sd-event/sd-event.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-event/sd-event.c
b/src/libsystemd/sd-event/sd-event.c
index 1e3afaeaccf9cb8c119a6ff7b8c277464f41ed99..3a9d934aad56bfc39275bd2a3d39ee2f211e805b 100644
(file)
--- a/
src/libsystemd/sd-event/sd-event.c
+++ b/
src/libsystemd/sd-event/sd-event.c
@@
-894,6
+894,8
@@
_public_ int sd_event_add_time(
s->userdata = userdata;
s->enabled = SD_EVENT_ONESHOT;
s->userdata = userdata;
s->enabled = SD_EVENT_ONESHOT;
+ d->needs_rearm = true;
+
r = prioq_put(d->earliest, s, &s->time.earliest_index);
if (r < 0)
goto fail;
r = prioq_put(d->earliest, s, &s->time.earliest_index);
if (r < 0)
goto fail;
@@
-902,8
+904,6
@@
_public_ int sd_event_add_time(
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- d->needs_rearm = true;
-
if (ret)
*ret = s;
if (ret)
*ret = s;
@@
-1872,6
+1872,7
@@
static int process_timer(
prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
prioq_reshuffle(d->earliest, s, &s->time.earliest_index);
prioq_reshuffle(d->latest, s, &s->time.latest_index);
+ d->needs_rearm = true;
}
return 0;
}
return 0;