summaryrefslogtreecommitdiff
path: root/source4/torture/raw/lockbench.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-17 01:19:20 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-17 01:19:20 +0200
commit06d06c6c9415140167708d09307125067c1f5b87 (patch)
tree35085314859e78dd9ebfd3ee6093a353931f0f0e /source4/torture/raw/lockbench.c
parentf875669314ce1398367b85f962941dacef6fc828 (diff)
downloadsamba-06d06c6c9415140167708d09307125067c1f5b87.tar.gz
samba-06d06c6c9415140167708d09307125067c1f5b87.tar.bz2
samba-06d06c6c9415140167708d09307125067c1f5b87.zip
Use provided event context rather than looking for it.
(This used to be commit fd0bb96acea3d7949cf0574bb6f3568a90f67f4e)
Diffstat (limited to 'source4/torture/raw/lockbench.c')
-rw-r--r--source4/torture/raw/lockbench.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 86030c538a..d7738be833 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -316,7 +316,6 @@ bool torture_bench_lock(struct torture_context *torture)
int i;
int timelimit = torture_setting_int(torture, "timelimit", 10);
struct timeval tv;
- struct event_context *ev = event_context_find(mem_ctx);
struct benchlock_state *state;
int total = 0, minops=0;
struct smbcli_state *cli;
@@ -333,8 +332,8 @@ bool torture_bench_lock(struct torture_context *torture)
state[i].tctx = torture;
state[i].mem_ctx = talloc_new(state);
state[i].client_num = i;
- state[i].ev = ev;
- if (!torture_open_connection_ev(&cli, i, torture, ev)) {
+ state[i].ev = torture->ev;
+ if (!torture_open_connection_ev(&cli, i, torture, torture->ev)) {
return false;
}
talloc_steal(mem_ctx, state);
@@ -380,7 +379,7 @@ bool torture_bench_lock(struct torture_context *torture)
printf("Running for %d seconds\n", timelimit);
while (timeval_elapsed(&tv) < timelimit) {
- event_loop_once(ev);
+ event_loop_once(torture->ev);
if (lock_failed) {
DEBUG(0,("locking failed\n"));