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/tests | |
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/tests')
-rw-r--r-- | ctdb/tests/src/ctdb_bench.c | 30 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_fetch.c | 15 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_fetch_one.c | 9 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_fetch_readonly_loop.c | 9 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_fetch_readonly_once.c | 6 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_persistent.c | 18 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_randrec.c | 6 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_store.c | 10 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_trackingdb_test.c | 4 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_transaction.c | 18 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_traverse.c | 10 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_update_record.c | 9 | ||||
-rw-r--r-- | ctdb/tests/src/ctdb_update_record_persistent.c | 10 |
13 files changed, 83 insertions, 71 deletions
diff --git a/ctdb/tests/src/ctdb_bench.c b/ctdb/tests/src/ctdb_bench.c index 09cb8abb61d..bc0a7cc2880 100644 --- a/ctdb/tests/src/ctdb_bench.c +++ b/ctdb/tests/src/ctdb_bench.c @@ -121,7 +121,7 @@ static void send_start_messages(struct ctdb_context *ctdb, int incr) ctdb_client_send_message(ctdb, dest, 0, data); } -static void each_second(struct event_context *ev, struct timed_event *te, +static void each_second(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { struct bench_data *bdata = talloc_get_type_abort( @@ -141,18 +141,18 @@ static void each_second(struct event_context *ev, struct timed_event *te, // printf("no messages recevied, try again to kickstart the ring in reverse direction...\n"); send_start_messages(bdata->ctdb, -1); } - event_add_timed(bdata->ev, bdata, timeval_current_ofs(1, 0), - each_second, bdata); + tevent_add_timer(bdata->ev, bdata, timeval_current_ofs(1, 0), + each_second, bdata); } -static void dummy_event(struct event_context *ev, struct timed_event *te, - struct timeval t, void *private_data) +static void dummy_event(struct tevent_context *ev, struct tevent_timer *te, + struct timeval t, void *private_data) { struct bench_data *bdata = talloc_get_type_abort( private_data, struct bench_data); - event_add_timed(bdata->ev, bdata, timeval_current_ofs(1, 0), - dummy_event, bdata); + tevent_add_timer(bdata->ev, bdata, timeval_current_ofs(1, 0), + dummy_event, bdata); } /* @@ -163,11 +163,11 @@ static void bench_ring(struct bench_data *bdata) int pnn = ctdb_get_pnn(bdata->ctdb); if (pnn == 0) { - event_add_timed(bdata->ev, bdata, timeval_current_ofs(1, 0), - each_second, bdata); + tevent_add_timer(bdata->ev, bdata, timeval_current_ofs(1, 0), + each_second, bdata); } else { - event_add_timed(bdata->ev, bdata, timeval_current_ofs(1, 0), - dummy_event, bdata); + tevent_add_timer(bdata->ev, bdata, timeval_current_ofs(1, 0), + dummy_event, bdata); } start_timer(); @@ -178,7 +178,7 @@ static void bench_ring(struct bench_data *bdata) bdata->msg_plus, bdata->msg_minus); fflush(stdout); } - event_loop_once(bdata->ev); + tevent_loop_once(bdata->ev); } printf("Ring: %.2f msgs/sec (+ve=%d -ve=%d)\n", @@ -207,7 +207,7 @@ int main(int argc, const char *argv[]) int extra_argc = 0; int ret; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; struct bench_data *bdata; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -233,7 +233,7 @@ int main(int argc, const char *argv[]) exit(1); } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); /* initialise ctdb */ ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); @@ -274,7 +274,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } bench_ring(bdata); diff --git a/ctdb/tests/src/ctdb_fetch.c b/ctdb/tests/src/ctdb_fetch.c index 2b11bad2a2f..5567af3e764 100644 --- a/ctdb/tests/src/ctdb_fetch.c +++ b/ctdb/tests/src/ctdb_fetch.c @@ -129,7 +129,8 @@ static void message_handler(uint64_t srvid, TDB_DATA data, void *private_data) /* * timeout handler - noop */ -static void timeout_handler(struct event_context *ev, struct timed_event *timer, +static void timeout_handler(struct tevent_context *ev, + struct tevent_timer *timer, struct timeval curtime, void *private_data) { return; @@ -153,15 +154,15 @@ static void bench_fetch(struct bench_data *bdata) } start_timer(); - event_add_timed(bdata->ev, bdata, timeval_current_ofs(timelimit,0), - timeout_handler, NULL); + tevent_add_timer(bdata->ev, bdata, timeval_current_ofs(timelimit,0), + timeout_handler, NULL); while (end_timer() < timelimit) { if (pnn == 0 && bdata->msg_count % 100 == 0 && end_timer() > 0) { printf("Fetch: %.2f msgs/sec\r", bdata->msg_count/end_timer()); fflush(stdout); } - if (event_loop_once(bdata->ev) != 0) { + if (tevent_loop_once(bdata->ev) != 0) { printf("Event loop failed!\n"); break; } @@ -200,7 +201,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; TDB_DATA key, data; struct ctdb_record_handle *h; int cluster_ready=0; @@ -231,7 +232,7 @@ int main(int argc, const char *argv[]) exit(1); } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); tevent_loop_allow_nesting(ev); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); @@ -268,7 +269,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } /* This test has a race condition. If CTDB receives the message from previous diff --git a/ctdb/tests/src/ctdb_fetch_one.c b/ctdb/tests/src/ctdb_fetch_one.c index ba0e183fe57..b704a6bc27c 100644 --- a/ctdb/tests/src/ctdb_fetch_one.c +++ b/ctdb/tests/src/ctdb_fetch_one.c @@ -49,7 +49,8 @@ static void alarm_handler(int sig) /* Just try locking/unlocking the same record over and over */ -static void bench_fetch_one_loop(struct ctdb_context *ctdb, struct event_context *ev) +static void bench_fetch_one_loop(struct ctdb_context *ctdb, + struct tevent_context *ev) { TDB_DATA key, data; @@ -91,7 +92,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -111,7 +112,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); @@ -133,7 +134,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } signal(SIGALRM, alarm_handler); diff --git a/ctdb/tests/src/ctdb_fetch_readonly_loop.c b/ctdb/tests/src/ctdb_fetch_readonly_loop.c index bd171f5a3c0..fdd5007fd86 100644 --- a/ctdb/tests/src/ctdb_fetch_readonly_loop.c +++ b/ctdb/tests/src/ctdb_fetch_readonly_loop.c @@ -33,7 +33,8 @@ static int count; /* Just try locking/unlocking a single record once */ -static void fetch_lock_once(struct ctdb_context *ctdb, struct event_context *ev) +static void fetch_lock_once(struct ctdb_context *ctdb, + struct tevent_context *ev) { TALLOC_CTX *tmp_ctx = talloc_new(ctdb); TDB_DATA key, data; @@ -84,7 +85,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -104,7 +105,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0)); if (ctdb == NULL) { @@ -134,7 +135,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } while (1) { diff --git a/ctdb/tests/src/ctdb_fetch_readonly_once.c b/ctdb/tests/src/ctdb_fetch_readonly_once.c index 5dc64e0e063..3b364f34096 100644 --- a/ctdb/tests/src/ctdb_fetch_readonly_once.c +++ b/ctdb/tests/src/ctdb_fetch_readonly_once.c @@ -52,7 +52,7 @@ int main(int argc, const char *argv[]) { struct ctdb_context *ctdb; struct ctdb_db_context *ctdb_db; - struct event_context *ev; + struct tevent_context *ev; TDB_DATA key; @@ -84,7 +84,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); if (ctdb == NULL) { @@ -108,7 +108,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } fetch_readonly_once(ctdb, ctdb_db, key); diff --git a/ctdb/tests/src/ctdb_persistent.c b/ctdb/tests/src/ctdb_persistent.c index 0bf92b345e8..99bd54c1a52 100644 --- a/ctdb/tests/src/ctdb_persistent.c +++ b/ctdb/tests/src/ctdb_persistent.c @@ -48,8 +48,8 @@ static TDB_DATA old_data; static int success = true; -static void each_second(struct event_context *ev, struct timed_event *te, - struct timeval t, void *private_data) +static void each_second(struct tevent_context *ev, struct tevent_timer *te, + struct timeval t, void *private_data) { struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context); int i; @@ -63,7 +63,7 @@ static void each_second(struct event_context *ev, struct timed_event *te, } printf("\n"); - event_add_timed(ev, ctdb, timeval_current_ofs(1, 0), each_second, ctdb); + tevent_add_timer(ev, ctdb, timeval_current_ofs(1, 0), each_second, ctdb); } static void check_counters(struct ctdb_context *ctdb, TDB_DATA data) @@ -101,7 +101,8 @@ static void check_counters(struct ctdb_context *ctdb, TDB_DATA data) -static void test_store_records(struct ctdb_context *ctdb, struct event_context *ev) +static void test_store_records(struct ctdb_context *ctdb, + struct tevent_context *ev) { TDB_DATA key; struct ctdb_db_context *ctdb_db; @@ -195,7 +196,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; setlinebuf(stdout); @@ -217,7 +218,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); if (ctdb == NULL) { @@ -244,14 +245,15 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } pnn = ctdb_get_pnn(ctdb); printf("Starting test on node %u. running for %u seconds\n", pnn, timelimit); if (pnn == 0) { - event_add_timed(ev, ctdb, timeval_current_ofs(1, 0), each_second, ctdb); + tevent_add_timer(ev, ctdb, timeval_current_ofs(1, 0), + each_second, ctdb); } test_store_records(ctdb, ev); diff --git a/ctdb/tests/src/ctdb_randrec.c b/ctdb/tests/src/ctdb_randrec.c index 60d233bed81..0813295e084 100644 --- a/ctdb/tests/src/ctdb_randrec.c +++ b/ctdb/tests/src/ctdb_randrec.c @@ -45,7 +45,7 @@ static int num_records = 10; static int delete_pct = 75; static int base_rec; -static void store_records(struct ctdb_context *ctdb, struct event_context *ev) +static void store_records(struct ctdb_context *ctdb, struct tevent_context *ev) { TDB_DATA key, data; struct ctdb_db_context *ctdb_db; @@ -158,7 +158,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -178,7 +178,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); diff --git a/ctdb/tests/src/ctdb_store.c b/ctdb/tests/src/ctdb_store.c index 69203434d6e..b0a7abb75e6 100644 --- a/ctdb/tests/src/ctdb_store.c +++ b/ctdb/tests/src/ctdb_store.c @@ -29,7 +29,7 @@ static int num_records = 10; static int base_rec; -static void store_records(struct ctdb_context *ctdb, struct event_context *ev) +static void store_records(struct ctdb_context *ctdb, struct tevent_context *ev) { TDB_DATA key, data; struct ctdb_db_context *ctdb_db; @@ -37,7 +37,7 @@ static void store_records(struct ctdb_context *ctdb, struct event_context *ev) int ret; struct ctdb_record_handle *h; uint32_t i; - + ctdb_db = ctdb_db_handle(ctdb, "test.tdb"); printf("creating %d records\n", num_records); @@ -111,7 +111,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -133,7 +133,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); @@ -154,7 +154,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } store_records(ctdb, ev); diff --git a/ctdb/tests/src/ctdb_trackingdb_test.c b/ctdb/tests/src/ctdb_trackingdb_test.c index 18bc174382f..1d0cf8b5ca4 100644 --- a/ctdb/tests/src/ctdb_trackingdb_test.c +++ b/ctdb/tests/src/ctdb_trackingdb_test.c @@ -102,7 +102,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -122,7 +122,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0)); if (ctdb == NULL) { diff --git a/ctdb/tests/src/ctdb_transaction.c b/ctdb/tests/src/ctdb_transaction.c index 78a63f1f126..53d0e3d812e 100644 --- a/ctdb/tests/src/ctdb_transaction.c +++ b/ctdb/tests/src/ctdb_transaction.c @@ -64,14 +64,14 @@ static void print_counters(void) printf("\n"); } -static void each_second(struct event_context *ev, struct timed_event *te, - struct timeval t, void *private_data) +static void each_second(struct tevent_context *ev, struct tevent_timer *te, + struct timeval t, void *private_data) { struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context); print_counters(); - event_add_timed(ev, ctdb, timeval_current_ofs(1, 0), each_second, ctdb); + tevent_add_timer(ev, ctdb, timeval_current_ofs(1, 0), each_second, ctdb); } static void check_counters(struct ctdb_context *ctdb, TDB_DATA data) @@ -114,7 +114,8 @@ static void do_sleep(unsigned int sec) if (verbose) printf("\n"); } -static void test_store_records(struct ctdb_context *ctdb, struct event_context *ev) +static void test_store_records(struct ctdb_context *ctdb, + struct tevent_context *ev) { TDB_DATA key; struct ctdb_db_context *ctdb_db; @@ -223,7 +224,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; if (verbose) { setbuf(stdout, (char *)NULL); /* don't buffer */ @@ -249,7 +250,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); if (ctdb == NULL) { @@ -276,14 +277,15 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } pnn = ctdb_get_pnn(ctdb); printf("Starting test on node %u. running for %u seconds. sleep delay: %u seconds.\n", pnn, timelimit, delay); if (!verbose && (pnn == 0)) { - event_add_timed(ev, ctdb, timeval_current_ofs(1, 0), each_second, ctdb); + tevent_add_timer(ev, ctdb, timeval_current_ofs(1, 0), + each_second, ctdb); } test_store_records(ctdb, ev); diff --git a/ctdb/tests/src/ctdb_traverse.c b/ctdb/tests/src/ctdb_traverse.c index 8ca76a3dd9e..37556dfc093 100644 --- a/ctdb/tests/src/ctdb_traverse.c +++ b/ctdb/tests/src/ctdb_traverse.c @@ -36,7 +36,9 @@ static int traverse_callback(TDB_DATA key, TDB_DATA data, void *private_data) return 0; } -static void traverse_loop(struct ctdb_context *ctdb, struct ctdb_db_context *ctdb_db, struct event_context *ev) +static void traverse_loop(struct ctdb_context *ctdb, + struct ctdb_db_context *ctdb_db, + struct tevent_context *ev) { uint32_t count; @@ -64,7 +66,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -86,7 +88,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); if (ctdb == NULL) { @@ -105,7 +107,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } while (1) { diff --git a/ctdb/tests/src/ctdb_update_record.c b/ctdb/tests/src/ctdb_update_record.c index 78d983bccc3..f582c4c27e4 100644 --- a/ctdb/tests/src/ctdb_update_record.c +++ b/ctdb/tests/src/ctdb_update_record.c @@ -32,7 +32,8 @@ static struct ctdb_db_context *ctdb_db; /* Just try locking/unlocking a single record once */ -static void fetch_lock_once(struct ctdb_context *ctdb, struct event_context *ev, uint32_t generation) +static void fetch_lock_once(struct ctdb_context *ctdb, + struct tevent_context *ev, uint32_t generation) { TALLOC_CTX *tmp_ctx = talloc_new(ctdb); TDB_DATA key, data; @@ -104,7 +105,7 @@ int main(int argc, const char *argv[]) const char **extra_argv; int extra_argc = 0; poptContext pc; - struct event_context *ev; + struct tevent_context *ev; struct ctdb_vnn_map *vnnmap=NULL; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); @@ -125,7 +126,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0)); if (ctdb == NULL) { @@ -144,7 +145,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } diff --git a/ctdb/tests/src/ctdb_update_record_persistent.c b/ctdb/tests/src/ctdb_update_record_persistent.c index d73636ea1c7..4781895bc71 100644 --- a/ctdb/tests/src/ctdb_update_record_persistent.c +++ b/ctdb/tests/src/ctdb_update_record_persistent.c @@ -26,7 +26,9 @@ #include "ctdb_private.h" -static void update_once(struct ctdb_context *ctdb, struct event_context *ev, struct ctdb_db_context *ctdb_db, char *record, char *value) +static void update_once(struct ctdb_context *ctdb, struct tevent_context *ev, + struct ctdb_db_context *ctdb_db, char *record, + char *value) { TDB_DATA key, data, olddata; struct ctdb_ltdb_header header; @@ -61,7 +63,7 @@ int main(int argc, const char *argv[]) char *record = NULL; char *value = NULL; struct ctdb_db_context *ctdb_db; - struct event_context *ev; + struct tevent_context *ev; struct poptOption popt_options[] = { POPT_AUTOHELP @@ -95,7 +97,7 @@ int main(int argc, const char *argv[]) while (extra_argv[extra_argc]) extra_argc++; } - ev = event_context_init(NULL); + ev = tevent_context_init(NULL); ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(5, 0)); if (ctdb == NULL) { @@ -129,7 +131,7 @@ int main(int argc, const char *argv[]) uint32_t recmode=1; ctdb_ctrl_getrecmode(ctdb, ctdb, timeval_zero(), CTDB_CURRENT_NODE, &recmode); if (recmode == 0) break; - event_loop_once(ev); + tevent_loop_once(ev); } update_once(ctdb, ev, ctdb_db, record, value); |