summaryrefslogtreecommitdiff
path: root/source4/torture/raw
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture/raw')
-rw-r--r--source4/torture/raw/composite.c8
-rw-r--r--source4/torture/raw/lockbench.c14
-rw-r--r--source4/torture/raw/offline.c8
-rw-r--r--source4/torture/raw/open.c4
-rw-r--r--source4/torture/raw/openbench.c14
-rw-r--r--source4/torture/raw/oplock.c6
6 files changed, 27 insertions, 27 deletions
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index fd1f6aaf97..ee3bf7260d 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -88,7 +88,7 @@ static bool test_loadfile(struct smbcli_state *cli, struct torture_context *tctx
printf("waiting for completion\n");
while (*count != num_ops) {
- event_loop_once(cli->transport->socket->event.ctx);
+ tevent_loop_once(cli->transport->socket->event.ctx);
if (torture_setting_bool(tctx, "progress", true)) {
printf("(%s) count=%d\r", __location__, *count);
fflush(stdout);
@@ -182,7 +182,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct
printf("waiting for completion\n");
while (*count != torture_numops) {
- event_loop_once(event_ctx);
+ tevent_loop_once(event_ctx);
if (torture_setting_bool(tctx, "progress", true)) {
printf("(%s) count=%d\r", __location__, *count);
fflush(stdout);
@@ -302,7 +302,7 @@ static bool test_appendacl(struct smbcli_state *cli, struct torture_context *tct
event_ctx = tctx->ev;
printf("waiting for completion\n");
while (*count != num_ops) {
- event_loop_once(event_ctx);
+ tevent_loop_once(event_ctx);
if (torture_setting_bool(tctx, "progress", true)) {
printf("(%s) count=%d\r", __location__, *count);
fflush(stdout);
@@ -372,7 +372,7 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx)
printf("waiting for completion\n");
while (*count < torture_numops) {
- event_loop_once(event_ctx);
+ tevent_loop_once(event_ctx);
if (torture_setting_bool(tctx, "progress", true)) {
printf("(%s) count=%d\r", __location__, *count);
fflush(stdout);
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 58e709dd2b..0a4faface8 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -153,7 +153,7 @@ static void reopen_connection_complete(struct composite_context *ctx)
status = smb_composite_connect_recv(ctx, state->mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(state->te);
- state->te = event_add_timed(state->ev, state->mem_ctx,
+ state->te = tevent_add_timer(state->ev, state->mem_ctx,
timeval_current_ofs(1,0),
reopen_connection, state);
return;
@@ -163,7 +163,7 @@ static void reopen_connection_complete(struct composite_context *ctx)
state->tree = io->out.tree;
/* do the reopen as a separate event */
- event_add_timed(state->ev, state->mem_ctx, timeval_zero(), reopen_file, state);
+ tevent_add_timer(state->ev, state->mem_ctx, timeval_zero(), reopen_file, state);
}
@@ -233,7 +233,7 @@ static void lock_completion(struct smbcli_request *req)
num_connected--;
DEBUG(0,("reopening connection to %s\n", state->dest_host));
talloc_free(state->te);
- state->te = event_add_timed(state->ev, state->mem_ctx,
+ state->te = tevent_add_timer(state->ev, state->mem_ctx,
timeval_current_ofs(1,0),
reopen_connection, state);
} else {
@@ -272,7 +272,7 @@ static void echo_completion(struct smbcli_request *req)
num_connected--;
DEBUG(0,("reopening connection to %s\n", state->dest_host));
talloc_free(state->te);
- state->te = event_add_timed(state->ev, state->mem_ctx,
+ state->te = tevent_add_timer(state->ev, state->mem_ctx,
timeval_current_ofs(1,0),
reopen_connection, state);
}
@@ -290,7 +290,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
}
printf("\r");
fflush(stdout);
- event_add_timed(ev, state, timeval_current_ofs(1, 0), report_rate, state);
+ tevent_add_timer(ev, state, timeval_current_ofs(1, 0), report_rate, state);
/* send an echo on each interface to ensure it stays alive - this helps
with IP takeover */
@@ -396,12 +396,12 @@ bool torture_bench_lock(struct torture_context *torture)
tv = timeval_current();
if (progress) {
- event_add_timed(torture->ev, state, timeval_current_ofs(1, 0), report_rate, state);
+ tevent_add_timer(torture->ev, state, timeval_current_ofs(1, 0), report_rate, state);
}
printf("Running for %d seconds\n", timelimit);
while (timeval_elapsed(&tv) < timelimit) {
- event_loop_once(torture->ev);
+ tevent_loop_once(torture->ev);
if (lock_failed) {
DEBUG(0,("locking failed\n"));
diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c
index a8259e2d42..85b1235ff6 100644
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -355,7 +355,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
latencies[OP_LOADFILE],
worst_latencies[OP_LOADFILE]);
fflush(stdout);
- event_add_timed(ev, state, timeval_current_ofs(1, 0), report_rate, state);
+ tevent_add_timer(ev, state, timeval_current_ofs(1, 0), report_rate, state);
for (i=0;i<OP_ENDOFLIST;i++) {
if (latencies[i] > worst_latencies[i]) {
@@ -471,12 +471,12 @@ bool torture_test_offline(struct torture_context *torture)
tv = timeval_current();
if (progress) {
- event_add_timed(torture->ev, state, timeval_current_ofs(1, 0), report_rate, state);
+ tevent_add_timer(torture->ev, state, timeval_current_ofs(1, 0), report_rate, state);
}
printf("Running for %d seconds\n", timelimit);
while (timeval_elapsed(&tv) < timelimit) {
- event_loop_once(torture->ev);
+ tevent_loop_once(torture->ev);
if (test_failed) {
DEBUG(0,("test failed\n"));
@@ -490,7 +490,7 @@ bool torture_test_offline(struct torture_context *torture)
while (state[i].loadfile ||
state[i].savefile ||
state[i].req) {
- event_loop_once(torture->ev);
+ tevent_loop_once(torture->ev);
}
}
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 8a66a12cd5..3460a172b6 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -1633,9 +1633,9 @@ static bool test_raw_open_multi(struct torture_context *tctx, struct smbcli_stat
break;
}
- if (event_loop_once(tctx->ev) != 0) {
+ if (tevent_loop_once(tctx->ev) != 0) {
torture_result(tctx, TORTURE_FAIL,
- "(%s): event_loop_once failed\n", __location__);
+ "(%s): tevent_loop_once failed\n", __location__);
return false;
}
}
diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index d0c785d460..9543eea1b1 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -91,7 +91,7 @@ static void reopen_connection_complete(struct composite_context *ctx)
status = smb_composite_connect_recv(ctx, state->mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(state->te);
- state->te = event_add_timed(state->ev, state->mem_ctx,
+ state->te = tevent_add_timer(state->ev, state->mem_ctx,
timeval_current_ofs(1,0),
reopen_connection, state);
return;
@@ -233,7 +233,7 @@ static void open_completed(struct smbcli_request *req)
DEBUG(0,("[%u] reopening connection to %s\n",
state->client_num, state->dest_host));
talloc_free(state->te);
- state->te = event_add_timed(state->ev, state->mem_ctx,
+ state->te = tevent_add_timer(state->ev, state->mem_ctx,
timeval_current_ofs(1,0),
reopen_connection, state);
return;
@@ -293,7 +293,7 @@ static void close_completed(struct smbcli_request *req)
DEBUG(0,("[%u] reopening connection to %s\n",
state->client_num, state->dest_host));
talloc_free(state->te);
- state->te = event_add_timed(state->ev, state->mem_ctx,
+ state->te = tevent_add_timer(state->ev, state->mem_ctx,
timeval_current_ofs(1,0),
reopen_connection, state);
return;
@@ -326,7 +326,7 @@ static void echo_completion(struct smbcli_request *req)
DEBUG(0,("[%u] reopening connection to %s\n",
state->client_num, state->dest_host));
talloc_free(state->te);
- state->te = event_add_timed(state->ev, state->mem_ctx,
+ state->te = tevent_add_timer(state->ev, state->mem_ctx,
timeval_current_ofs(1,0),
reopen_connection, state);
}
@@ -344,7 +344,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
}
printf("\r");
fflush(stdout);
- report_te = event_add_timed(ev, state, timeval_current_ofs(1, 0),
+ report_te = tevent_add_timer(ev, state, timeval_current_ofs(1, 0),
report_rate, state);
/* send an echo on each interface to ensure it stays alive - this helps
@@ -434,13 +434,13 @@ bool torture_bench_open(struct torture_context *torture)
tv = timeval_current();
if (progress) {
- report_te = event_add_timed(torture->ev, state, timeval_current_ofs(1, 0),
+ report_te = tevent_add_timer(torture->ev, state, timeval_current_ofs(1, 0),
report_rate, state);
}
printf("Running for %d seconds\n", timelimit);
while (timeval_elapsed(&tv) < timelimit) {
- event_loop_once(torture->ev);
+ tevent_loop_once(torture->ev);
if (open_failed) {
DEBUG(0,("open failed\n"));
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 01b1dd2b93..46f2ed3230 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -226,7 +226,7 @@ static void torture_wait_for_oplock_break(struct torture_context *tctx)
/* Wait .1 seconds for an oplock break */
ne = tevent_timeval_current_ofs(0, 100000);
- if ((te = event_add_timed(tctx->ev, tmp_ctx, ne, timeout_cb, &timesup))
+ if ((te = tevent_add_timer(tctx->ev, tmp_ctx, ne, timeout_cb, &timesup))
== NULL)
{
torture_comment(tctx, "Failed to wait for an oplock break. "
@@ -235,7 +235,7 @@ static void torture_wait_for_oplock_break(struct torture_context *tctx)
}
while (!timesup && break_info.count < old_count + 1) {
- if (event_loop_once(tctx->ev) != 0) {
+ if (tevent_loop_once(tctx->ev) != 0) {
torture_comment(tctx, "Failed to wait for an oplock "
"break. test results may not be "
"accurate.");
@@ -4196,7 +4196,7 @@ bool torture_hold_oplock(struct torture_context *torture,
}
printf("Waiting for oplock events\n");
- event_loop_wait(ev);
+ tevent_loop_wait(ev);
return true;
}
generated by cgit (git 2.34.1) at 2024-06-29 21:25:45 +0000