SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-event: rename PASSIVE/PREPARED to INITIAL/ARMED

Browse Source
This commit is contained in:
Tom Gundersen
2015-03-14 12:17:24 +01:00
parent f5ce2b4958
commit 2b0c9ef735
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-event/sd-event.c
+11 -11
View File
@@ -2234,7 +2234,7 @@ static int dispatch_exit(sd_event *e) {
r = source_dispatch(p);
e->state = SD_EVENT_PASSIVE;
e->state = SD_EVENT_INITIAL;
sd_event_unref(e);
return r;
@@ -2303,7 +2303,7 @@ _public_ int sd_event_prepare(sd_event *e) {
assert_return(e, -EINVAL);
assert_return(!event_pid_changed(e), -ECHILD);
assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
assert_return(e->state == SD_EVENT_PASSIVE, -EBUSY);
assert_return(e->state == SD_EVENT_INITIAL, -EBUSY);
if (e->exit_requested)
goto pending;
@@ -2337,15 +2337,15 @@ _public_ int sd_event_prepare(sd_event *e) {
if (event_next_pending(e) || e->need_process_child)
goto pending;
e->state = SD_EVENT_PREPARED;
e->state = SD_EVENT_ARMED;
return 0;
pending:
e->state = SD_EVENT_PREPARED;
e->state = SD_EVENT_ARMED;
r = sd_event_wait(e, 0);
if (r == 0)
e->state = SD_EVENT_PREPARED;
e->state = SD_EVENT_ARMED;
return r;
}
@@ -2358,7 +2358,7 @@ _public_ int sd_event_wait(sd_event *e, uint64_t timeout) {
assert_return(e, -EINVAL);
assert_return(!event_pid_changed(e), -ECHILD);
assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
assert_return(e->state == SD_EVENT_PREPARED, -EBUSY);
assert_return(e->state == SD_EVENT_ARMED, -EBUSY);
if (e->exit_requested) {
e->state = SD_EVENT_PENDING;
@@ -2446,7 +2446,7 @@ _public_ int sd_event_wait(sd_event *e, uint64_t timeout) {
r = 0;
finish:
e->state = SD_EVENT_PASSIVE;
e->state = SD_EVENT_INITIAL;
return r;
}
@@ -2469,14 +2469,14 @@ _public_ int sd_event_dispatch(sd_event *e) {
e->state = SD_EVENT_RUNNING;
r = source_dispatch(p);
e->state = SD_EVENT_PASSIVE;
e->state = SD_EVENT_INITIAL;
sd_event_unref(e);
return r;
}
e->state = SD_EVENT_PASSIVE;
e->state = SD_EVENT_INITIAL;
return 1;
}
@@ -2487,7 +2487,7 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
assert_return(e, -EINVAL);
assert_return(!event_pid_changed(e), -ECHILD);
assert_return(e->state != SD_EVENT_FINISHED, -ESTALE);
assert_return(e->state == SD_EVENT_PASSIVE, -EBUSY);
assert_return(e->state == SD_EVENT_INITIAL, -EBUSY);
r = sd_event_prepare(e);
if (r > 0)
@@ -2507,7 +2507,7 @@ _public_ int sd_event_loop(sd_event *e) {
assert_return(e, -EINVAL);
assert_return(!event_pid_changed(e), -ECHILD);
assert_return(e->state == SD_EVENT_PASSIVE, -EBUSY);
assert_return(e->state == SD_EVENT_INITIAL, -EBUSY);
sd_event_ref(e);
src/systemd/sd-event.h
+2 -2
View File
@@ -51,8 +51,8 @@ enum {
};
enum {
SD_EVENT_PASSIVE,
SD_EVENT_PREPARED,
SD_EVENT_INITIAL,
SD_EVENT_ARMED,
SD_EVENT_PENDING,
SD_EVENT_RUNNING,
SD_EVENT_EXITING,