diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-26 16:50:09 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-10-30 02:00:27 +0100 |
| commit | 2fdb332fad541efd34be749e55a07569ce2b4ef4 (patch) | |
| tree | d84629d392241f089b1d5dc7e025573938e57b3c /ctdb/server/eventscript.c | |
| parent | 7084cb92e2b30134b2d5c9017a558f9e7b7696fe (diff) | |
| download | samba-2fdb332fad541efd34be749e55a07569ce2b4ef4.tar.gz | |
ctdb-daemon: Stop using tevent compatibility definitions
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/server/eventscript.c')
| -rw-r--r-- | ctdb/server/eventscript.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c index b1b77cd1cdd..27ec91f7bb8 100644 --- a/ctdb/server/eventscript.c +++ b/ctdb/server/eventscript.c @@ -28,7 +28,9 @@ #include "lib/util/dlinklist.h" #include "common/system.h" -static void ctdb_event_script_timeout(struct event_context *ev, struct timed_event *te, struct timeval t, void *p); +static void ctdb_event_script_timeout(struct tevent_context *ev, + struct tevent_timer *te, + struct timeval t, void *p); /* This is attached to the event script state. */ struct event_script_callback { @@ -269,7 +271,8 @@ failed: } -static void ctdb_event_script_handler(struct event_context *ev, struct fd_event *fde, +static void ctdb_event_script_handler(struct tevent_context *ev, + struct tevent_fd *fde, uint16_t flags, void *p); static char helper_prog[PATH_MAX+1] = ""; @@ -325,8 +328,8 @@ static int fork_child_for_script(struct ctdb_context *ctdb, set_close_on_exec(state->fd[0]); /* Set ourselves up to be called when that's done. */ - fde = event_add_fd(ctdb->ev, state, state->fd[0], EVENT_FD_READ, - ctdb_event_script_handler, state); + fde = tevent_add_fd(ctdb->ev, state, state->fd[0], TEVENT_FD_READ, + ctdb_event_script_handler, state); tevent_fd_set_auto_close(fde); return 0; @@ -359,7 +362,8 @@ static int script_status(struct ctdb_scripts_wire *scripts) } /* called when child is finished */ -static void ctdb_event_script_handler(struct event_context *ev, struct fd_event *fde, +static void ctdb_event_script_handler(struct tevent_context *ev, + struct tevent_fd *fde, uint16_t flags, void *p) { struct ctdb_event_script_state *state = @@ -509,7 +513,7 @@ static void ctdb_run_debug_hung_script(struct ctdb_context *ctdb, struct debug_h return; } - tfd = tevent_add_fd(ctdb->ev, state, fd[0], EVENT_FD_READ, + tfd = tevent_add_fd(ctdb->ev, state, fd[0], TEVENT_FD_READ, debug_hung_script_done, state); if (tfd == NULL) { talloc_free(ttimer); @@ -520,7 +524,8 @@ static void ctdb_run_debug_hung_script(struct ctdb_context *ctdb, struct debug_h } /* called when child times out */ -static void ctdb_event_script_timeout(struct event_context *ev, struct timed_event *te, +static void ctdb_event_script_timeout(struct tevent_context *ev, + struct tevent_timer *te, struct timeval t, void *p) { struct ctdb_event_script_state *state = talloc_get_type(p, struct ctdb_event_script_state); @@ -812,7 +817,10 @@ static int ctdb_event_script_callback_v(struct ctdb_context *ctdb, } if (!timeval_is_zero(&state->timeout)) { - event_add_timed(ctdb->ev, state, timeval_current_ofs(state->timeout.tv_sec, state->timeout.tv_usec), ctdb_event_script_timeout, state); + tevent_add_timer(ctdb->ev, state, + timeval_current_ofs(state->timeout.tv_sec, + state->timeout.tv_usec), + ctdb_event_script_timeout, state); } else { DEBUG(DEBUG_ERR, (__location__ " eventscript %s %s called with no timeout\n", ctdb_eventscript_call_names[state->call], @@ -882,7 +890,7 @@ int ctdb_event_script_args(struct ctdb_context *ctdb, enum ctdb_eventscript_call return ret; } - while (status.done == false && event_loop_once(ctdb->ev) == 0) /* noop */; + while (status.done == false && tevent_loop_once(ctdb->ev) == 0) /* noop */; if (status.status == -ETIME) { DEBUG(DEBUG_ERR, (__location__ " eventscript for '%s' timedout." |