sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s3:libsmb: make use of cli_state_max_requests() in cli_push_send()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2011-09-13 16:30:56 +02:00
parent c5072534bc
commit 7c405fd92c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/libsmb/clireadwrite.c
View File

@ -1083,6 +1083,7 @@ struct cli_push_state {
* Outstanding requests * Outstanding requests
*/ */
uint32_t pending; uint32_t pending;
uint16_t max_reqs;
uint32_t num_reqs; uint32_t num_reqs;
struct cli_push_write_state **reqs; struct cli_push_write_state **reqs;
}; };
@ -1166,14 +1167,16 @@ struct tevent_req *cli_push_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
state->chunk_size = cli_write_max_bufsize(cli, mode, 14); state->chunk_size = cli_write_max_bufsize(cli, mode, 14);
state->max_reqs = cli_state_max_requests(cli);
if (window_size == 0) { if (window_size == 0) {
window_size = cli->max_mux * state->chunk_size; window_size = state->max_reqs * state->chunk_size;
} }
state->num_reqs = window_size/state->chunk_size; state->num_reqs = window_size/state->chunk_size;
if ((window_size % state->chunk_size) > 0) { if ((window_size % state->chunk_size) > 0) {
state->num_reqs += 1; state->num_reqs += 1;
} }
state->num_reqs = MIN(state->num_reqs, cli->max_mux); state->num_reqs = MIN(state->num_reqs, state->max_reqs);
state->num_reqs = MAX(state->num_reqs, 1); state->num_reqs = MAX(state->num_reqs, 1);
state->reqs = talloc_zero_array(state, struct cli_push_write_state *, state->reqs = talloc_zero_array(state, struct cli_push_write_state *,