diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-05-09 12:47:49 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-05-10 12:55:36 +0200 |
| commit | 31b39c40cf909d34f27dc655755f346482f57089 (patch) | |
| tree | 4fcf5799aebdf1573b6789f1a19ef3ac8aa0e279 /lib/pipeline.c | |
| parent | e9fd794a616c10bd0d017a76f8fdccaf4cc76851 (diff) | |
multi: use a fixed array of timers instead of malloc
... since the total amount is low this is faster, easier and reduces
memory overhead.
Also, Curl_expire_done() can now mark an expire timeout as done so that
it never times out.
Closes #1472
Diffstat (limited to 'lib/pipeline.c')
| -rw-r--r-- | lib/pipeline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pipeline.c b/lib/pipeline.c index 729e69c27..b8d203745 100644 --- a/lib/pipeline.c +++ b/lib/pipeline.c @@ -113,7 +113,7 @@ CURLcode Curl_add_handle_to_pipeline(struct Curl_easy *handle, if(pipeline == &conn->send_pipe && sendhead != conn->send_pipe.head) { /* this is a new one as head, expire it */ Curl_pipeline_leave_write(conn); /* not in use yet */ - Curl_expire(conn->send_pipe.head->ptr, 0, EXPIRE_PIPELINE_SEND); + Curl_expire(conn->send_pipe.head->ptr, 0, EXPIRE_RUN_NOW); } #if 0 /* enable for pipeline debugging */ @@ -148,7 +148,7 @@ void Curl_move_handle_from_send_to_recv_pipe(struct Curl_easy *handle, infof(conn->data, "%p is at send pipe head B!\n", (void *)conn->send_pipe.head->ptr); #endif - Curl_expire(conn->send_pipe.head->ptr, 0, EXPIRE_PIPELINE_READ); + Curl_expire(conn->send_pipe.head->ptr, 0, EXPIRE_RUN_NOW); } /* The receiver's list is not really interesting here since either this |