Unverified Commit 5c8783d7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

process_pending_handles: mark queued transfers as previously pending 

With transfers being queued up, we only move one at a a time back to the
CONNECT state but now we mark moved transfers so that when a moved
transfer is confirmed "successful" (it connected) it will trigger the
move of another pending transfer. Previously, it would otherwise wait
until the transfer was done before doing this. This makes queued up
pending transfers get processed (much) faster.
parent c32248f1

lib/multi.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -1365,6 +1365,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
        result = CURLE_OK;

        result = CURLE_OK;

        break;

        break;

      }

      }

      else if(data->state.previouslypending) {

        /* this transfer comes from the pending queue so try move another */

        infof(data, "Transfer was pending, now try another\n");

        process_pending_handles(data->multi);

      }





      if(!result) {

      if(!result) {

        if(async)

        if(async)
@@ -2991,6 +2996,9 @@ static void process_pending_handles(struct Curl_multi *multi) 




    /* Make sure that the handle will be processed soonish. */

    /* Make sure that the handle will be processed soonish. */

    Curl_expire(data, 0, EXPIRE_RUN_NOW);

    Curl_expire(data, 0, EXPIRE_RUN_NOW);



    /* mark this as having been in the pending queue */

    data->state.previouslypending = TRUE;

  }

  }

}

}

lib/urldata.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1363,6 +1363,7 @@ struct UrlState { 
                  when multi_done() is called, to prevent multi_done() to get

                  when multi_done() is called, to prevent multi_done() to get

                  invoked twice when the multi interface is used. */

                  invoked twice when the multi interface is used. */

  bit stream_depends_e:1; /* set or don't set the Exclusive bit */

  bit stream_depends_e:1; /* set or don't set the Exclusive bit */

  bit previouslypending:1; /* this transfer WAS in the multi->pending queue */

};

};