summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-09-22 21:30:13 +0200
committerStefan Metzmacher <metze@samba.org>2011-11-29 16:00:08 +0100
commit511dc9358d8954f9ef04c01fb7cc3f776625c1f2 (patch)
tree5d781d27cc69ee8159d2ad1b5ad41e3d5507409f /source4
parent13dbef241b24d54c7e8793ff81090614393d76ad (diff)
downloadsamba-511dc9358d8954f9ef04c01fb7cc3f776625c1f2.tar.gz
samba-511dc9358d8954f9ef04c01fb7cc3f776625c1f2.tar.bz2
samba-511dc9358d8954f9ef04c01fb7cc3f776625c1f2.zip
s4:torture: use tctx->ev as event context for polling
metze
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/basic/base.c2
-rw-r--r--source4/torture/raw/composite.c4
-rw-r--r--source4/torture/raw/oplock.c3
-rw-r--r--source4/torture/raw/qfileinfo.c2
-rw-r--r--source4/torture/raw/samba3misc.c5
-rw-r--r--source4/torture/rpc/samba3rpc.c20
6 files changed, 14 insertions, 22 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index cd0f61b681..519ad406fe 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -362,7 +362,7 @@ static bool run_negprot_nowait(struct torture_context *tctx)
for (i=0;i<100;i++) {
struct smbcli_request *req;
req = smb_raw_negotiate_send(cli->transport, lpcfg_unicode(tctx->lp_ctx), PROTOCOL_NT1);
- tevent_loop_once(cli->transport->socket->event.ctx);
+ tevent_loop_once(tctx->ev);
if (req->state == SMBCLI_REQUEST_ERROR) {
if (i > 0) {
torture_comment(tctx, "Failed to fill pipe packet[%d] - %s (ignored)\n", i+1, nt_errstr(req->status));
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index ee3bf7260d..2a28b9d50e 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) {
- tevent_loop_once(cli->transport->socket->event.ctx);
+ tevent_loop_once(tctx->ev);
if (torture_setting_bool(tctx, "progress", true)) {
printf("(%s) count=%d\r", __location__, *count);
fflush(stdout);
@@ -170,7 +170,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct
printf("Testing parallel fetchfile with %d ops\n", torture_numops);
- event_ctx = cli->transport->socket->event.ctx;
+ event_ctx = tctx->ev;
c = talloc_array(tctx, struct composite_context *, torture_numops);
for (i=0; i<torture_numops; i++) {
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index d3c7aae025..7b67c528a7 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -4133,8 +4133,7 @@ static bool oplock_handler_hold(struct smbcli_transport *transport,
bool torture_hold_oplock(struct torture_context *torture,
struct smbcli_state *cli)
{
- struct tevent_context *ev =
- (struct tevent_context *)cli->transport->socket->event.ctx;
+ struct tevent_context *ev = torture->ev;
int i;
printf("Setting up open files with oplocks in %s\n", BASEDIR);
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index ca5f66795e..4f6d8d56b9 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -889,7 +889,7 @@ bool torture_raw_qfileinfo_pipe(struct torture_context *torture,
struct smbcli_tree *ipc_tree;
NTSTATUS status;
- if (!(p = dcerpc_pipe_init(torture, cli->tree->session->transport->socket->event.ctx))) {
+ if (!(p = dcerpc_pipe_init(torture, torture->ev))) {
return false;
}
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
index 0125d1f3d7..07669ed28b 100644
--- a/source4/torture/raw/samba3misc.c
+++ b/source4/torture/raw/samba3misc.c
@@ -839,7 +839,7 @@ bool torture_samba3_posixtimedlock(struct torture_context *tctx)
req->async.fn = receive_lock_result;
req->async.private_data = &lock_result;
- te = tevent_add_timer(req->transport->socket->event.ctx,
+ te = tevent_add_timer(tctx->ev,
tctx, timeval_current_ofs(1, 0),
close_locked_file, &fd);
if (te == NULL) {
@@ -849,8 +849,7 @@ bool torture_samba3_posixtimedlock(struct torture_context *tctx)
}
while ((fd != -1) || (!lock_result.done)) {
- if (tevent_loop_once(req->transport->socket->event.ctx)
- == -1) {
+ if (tevent_loop_once(tctx->ev) == -1) {
torture_warning(tctx, "tevent_loop_once failed: %s\n",
strerror(errno));
ret = false;
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index ba21cad0f1..5274603fd2 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -91,7 +91,7 @@ bool torture_bind_authcontext(struct torture_context *torture)
goto done;
}
- lsa_pipe = dcerpc_pipe_init(mem_ctx, cli->transport->socket->event.ctx);
+ lsa_pipe = dcerpc_pipe_init(mem_ctx, torture->ev);
if (lsa_pipe == NULL) {
torture_comment(torture, "dcerpc_pipe_init failed\n");
goto done;
@@ -221,8 +221,7 @@ static bool bindtest(struct torture_context *tctx,
return false;
}
- lsa_pipe = dcerpc_pipe_init(mem_ctx,
- cli->transport->socket->event.ctx);
+ lsa_pipe = dcerpc_pipe_init(mem_ctx, tctx->ev);
if (lsa_pipe == NULL) {
torture_comment(tctx, "dcerpc_pipe_init failed\n");
goto done;
@@ -392,8 +391,7 @@ static bool get_usr_handle(struct torture_context *tctx,
struct samr_CreateUser2 c;
uint32_t user_rid,access_granted;
- samr_pipe = dcerpc_pipe_init(mem_ctx,
- cli->transport->socket->event.ctx);
+ samr_pipe = dcerpc_pipe_init(mem_ctx, tctx->ev);
torture_assert(tctx, samr_pipe, "dcerpc_pipe_init failed");
samr_handle = samr_pipe->binding_handle;
@@ -947,8 +945,7 @@ static bool auth2(struct torture_context *tctx,
return false;
}
- net_pipe = dcerpc_pipe_init(mem_ctx,
- cli->transport->socket->event.ctx);
+ net_pipe = dcerpc_pipe_init(mem_ctx, tctx->ev);
if (net_pipe == NULL) {
torture_comment(tctx, "dcerpc_pipe_init failed\n");
goto done;
@@ -1063,8 +1060,7 @@ static bool schan(struct torture_context *tctx,
return false;
}
- net_pipe = dcerpc_pipe_init(mem_ctx,
- cli->transport->socket->event.ctx);
+ net_pipe = dcerpc_pipe_init(mem_ctx, tctx->ev);
if (net_pipe == NULL) {
torture_comment(tctx, "dcerpc_pipe_init failed\n");
goto done;
@@ -1508,8 +1504,7 @@ static NTSTATUS pipe_bind_smb(struct torture_context *tctx,
struct dcerpc_pipe *result;
NTSTATUS status;
- if (!(result = dcerpc_pipe_init(
- mem_ctx, tree->session->transport->socket->event.ctx))) {
+ if (!(result = dcerpc_pipe_init(mem_ctx, tctx->ev))) {
return NT_STATUS_NO_MEMORY;
}
@@ -2078,8 +2073,7 @@ static bool torture_samba3_rpc_randomauth2(struct torture_context *torture)
goto done;
}
- if (!(net_pipe = dcerpc_pipe_init(
- mem_ctx, cli->transport->socket->event.ctx))) {
+ if (!(net_pipe = dcerpc_pipe_init(mem_ctx, torture->ev))) {
torture_comment(torture, "dcerpc_pipe_init failed\n");
goto done;
}