generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multi: make multi_runsingle loop internally

Browse Source 
simplifies the use of this function at little cost.
This commit is contained in:
Daniel Stenberg 2014-11-18 14:34:55 +01:00
parent 1342a96ecf
commit e04ccbd506
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/multi.c
View File

@ -927,7 +927,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
bool protocol_connect = FALSE; bool protocol_connect = FALSE;
bool dophase_done = FALSE; bool dophase_done = FALSE;
bool done = FALSE; bool done = FALSE;
CURLMcode result = CURLM_OK; CURLMcode result;
struct SingleRequest *k; struct SingleRequest *k;
long timeout_ms; long timeout_ms;
int control; int control;
@ -936,9 +936,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
return CURLM_BAD_EASY_HANDLE; return CURLM_BAD_EASY_HANDLE;
do { do {
/* this is a single-iteration do-while loop just to allow a
break to skip to the end of it */
bool disconnect_conn = FALSE; bool disconnect_conn = FALSE;
result = CURLM_OK;
/* Handle the case when the pipe breaks, i.e., the connection /* Handle the case when the pipe breaks, i.e., the connection
we're using gets cleaned up and we're left with nothing. */ we're using gets cleaned up and we're left with nothing. */
@ -1752,7 +1751,7 @@ statemachine_end:
result = CURLM_CALL_MULTI_PERFORM; result = CURLM_CALL_MULTI_PERFORM;
} }
} }
} WHILE_FALSE; /* just to break out from! */ } while(result == CURLM_CALL_MULTI_PERFORM);
if(CURLM_STATE_COMPLETED == data->mstate) { if(CURLM_STATE_COMPLETED == data->mstate) {
/* now fill in the Curl_message with this info */ /* now fill in the Curl_message with this info */
@ -1797,9 +1796,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles)
} }
sigpipe_ignore(data, &pipe_st); sigpipe_ignore(data, &pipe_st);
do
result = multi_runsingle(multi, now, data); result = multi_runsingle(multi, now, data);
while(CURLM_CALL_MULTI_PERFORM == result);
sigpipe_restore(&pipe_st); sigpipe_restore(&pipe_st);
if(data->set.wildcardmatch) { if(data->set.wildcardmatch) {
@ -2269,9 +2266,7 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
data->easy_conn->cselect_bits = ev_bitmask; data->easy_conn->cselect_bits = ev_bitmask;
sigpipe_ignore(data, &pipe_st); sigpipe_ignore(data, &pipe_st);
do
result = multi_runsingle(multi, now, data); result = multi_runsingle(multi, now, data);
while(CURLM_CALL_MULTI_PERFORM == result);
sigpipe_restore(&pipe_st); sigpipe_restore(&pipe_st);
if(data->easy_conn && if(data->easy_conn &&
@ -2313,9 +2308,7 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
SIGPIPE_VARIABLE(pipe_st); SIGPIPE_VARIABLE(pipe_st);
sigpipe_ignore(data, &pipe_st); sigpipe_ignore(data, &pipe_st);
do
result = multi_runsingle(multi, now, data); result = multi_runsingle(multi, now, data);
while(CURLM_CALL_MULTI_PERFORM == result);
sigpipe_restore(&pipe_st); sigpipe_restore(&pipe_st);
if(CURLM_OK >= result) if(CURLM_OK >= result)