[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1697-gae38641

Volker Lendecke vlendec at samba.org
Tue May 19 21:10:02 GMT 2009


The branch, master has been updated
       via  ae386415b6fd15081f3b94faec917dafdeee1f93 (commit)
       via  15424162ca2f8e6627f179bc704cf4fb4372e399 (commit)
       via  f1c093c89f3880108dabeb823860105b251db283 (commit)
      from  05870b7ee73d64cb30e56f14f37828a0c9b7e9ec (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ae386415b6fd15081f3b94faec917dafdeee1f93
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 19 23:07:36 2009 +0200

    Make local-wbclient flexible in # of connections and ops

commit 15424162ca2f8e6627f179bc704cf4fb4372e399
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 19 23:06:48 2009 +0200

    Fix wb_trans_done after conversion to unix calling conventions

commit f1c093c89f3880108dabeb823860105b251db283
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 19 23:05:51 2009 +0200

    Fix an uninitialized variable in wb_context_init

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/wbclient.c    |    5 +++--
 source3/torture/torture.c |   10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/wbclient.c b/source3/lib/wbclient.c
index 891a214..63401fa 100644
--- a/source3/lib/wbclient.c
+++ b/source3/lib/wbclient.c
@@ -180,6 +180,7 @@ struct wb_context *wb_context_init(TALLOC_CTX *mem_ctx)
 		return NULL;
 	}
 	result->fd = -1;
+	result->is_priv = false;
 	return result;
 }
 
@@ -620,8 +621,8 @@ static void wb_trans_done(struct tevent_req *subreq)
 
 	ret = wb_simple_trans_recv(subreq, state, &state->wb_resp, &err);
 	TALLOC_FREE(subreq);
-
-	if (wb_trans_retry(req, state, map_wbc_err_from_errno(err))) {
+	if ((ret == -1)
+	    && wb_trans_retry(req, state, map_wbc_err_from_errno(err))) {
 		return;
 	}
 
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index fa1a222..2c68ee6 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -5809,7 +5809,7 @@ static bool run_local_wbclient(int dummy)
 		goto fail;
 	}
 
-	wb_ctx = TALLOC_ARRAY(ev, struct wb_context *, torture_numops);
+	wb_ctx = TALLOC_ARRAY(ev, struct wb_context *, nprocs);
 	if (wb_ctx == NULL) {
 		goto fail;
 	}
@@ -5817,12 +5817,14 @@ static bool run_local_wbclient(int dummy)
 	ZERO_STRUCT(wb_req);
 	wb_req.cmd = WINBINDD_PING;
 
-	for (i=0; i<torture_numops; i++) {
+	d_printf("nprocs=%d, numops=%d\n", (int)nprocs, (int)torture_numops);
+
+	for (i=0; i<nprocs; i++) {
 		wb_ctx[i] = wb_context_init(ev);
 		if (wb_ctx[i] == NULL) {
 			goto fail;
 		}
-		for (j=0; j<5; j++) {
+		for (j=0; j<torture_numops; j++) {
 			struct tevent_req *req;
 			req = wb_trans_send(ev, ev, wb_ctx[i],
 					    (j % 2) == 0, &wb_req);
@@ -5835,7 +5837,7 @@ static bool run_local_wbclient(int dummy)
 
 	i = 0;
 
-	while (i < 5 * torture_numops) {
+	while (i < nprocs * torture_numops) {
 		event_loop_once(ev);
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list