diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-31 08:30:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:25 -0500 |
| commit | 9a70f446fc4abc2bd1278772810c0e8132f4bea4 (patch) | |
| tree | b9baaa7b19c88afaa26f0cd0a35201fb5c433a3d /source4/torture | |
| parent | 58d6c73e946d11574a6220f37887e1cdfe05f525 (diff) | |
| download | samba-9a70f446fc4abc2bd1278772810c0e8132f4bea4.tar.gz samba-9a70f446fc4abc2bd1278772810c0e8132f4bea4.tar.bz2 samba-9a70f446fc4abc2bd1278772810c0e8132f4bea4.zip | |
r5126: the composite code is no longer client specific or smb specific, so
rename the core structure to composite_context and the wait routine to
composite_wait() (suggestion from metze)
(This used to be commit cf11d05e35179c2c3e51c5ab370cd0a3fb15f24a)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/raw/composite.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index d32c9393c2..98f33bea3e 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -26,7 +26,7 @@ #define BASEDIR "\\composite" -static void loadfile_complete(struct smbcli_composite *c) +static void loadfile_complete(struct composite_context *c) { int *count = talloc_get_type(c->async.private, int); (*count)++; @@ -41,7 +41,7 @@ static BOOL test_loadfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) NTSTATUS status; struct smb_composite_savefile io1; struct smb_composite_loadfile io2; - struct smbcli_composite **c; + struct composite_context **c; char *data; size_t len = random() % 100000; const int num_ops = 50; @@ -68,7 +68,7 @@ static BOOL test_loadfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) printf("testing parallel loadfile with %d ops\n", num_ops); - c = talloc_array(mem_ctx, struct smbcli_composite *, num_ops); + c = talloc_array(mem_ctx, struct composite_context *, num_ops); for (i=0;i<num_ops;i++) { c[i] = smb_composite_loadfile_send(cli->tree, &io2); @@ -117,7 +117,7 @@ static BOOL test_fetchfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) NTSTATUS status; struct smb_composite_savefile io1; struct smb_composite_fetchfile io2; - struct smbcli_composite **c; + struct composite_context **c; char *data; int i; size_t len = random() % 10000; @@ -156,7 +156,7 @@ static BOOL test_fetchfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) printf("testing parallel fetchfile with %d ops\n", torture_numops); event_ctx = event_context_init(mem_ctx); - c = talloc_array(mem_ctx, struct smbcli_composite *, torture_numops); + c = talloc_array(mem_ctx, struct composite_context *, torture_numops); for (i=0; i<torture_numops; i++) { c[i] = smb_composite_fetchfile_send(&io2, event_ctx); |