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

threaded resolver: no more expire 0 calls

Browse Source 
Curl_expire() set to 0 expires ALL timeouts so it should only be called
if we truly and really want to remove all timeouts for the handle.
This commit is contained in:
Daniel Stenberg 2010-09-01 16:47:42 +02:00
parent ce00c2ef5d
commit 5e92015711
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/hostthre.c
View File

@ -419,8 +419,6 @@ CURLcode Curl_is_resolved(struct connectdata *conn,
if (done) { if (done) {
getaddrinfo_complete(conn); getaddrinfo_complete(conn);
if (td->poll_interval != 0)
Curl_expire(conn->data, 0);
Curl_destroy_thread_data(&conn->async); Curl_destroy_thread_data(&conn->async);
if(!conn->async.dns) { if(!conn->async.dns) {
@ -431,29 +429,21 @@ CURLcode Curl_is_resolved(struct connectdata *conn,
*entry = conn->async.dns; *entry = conn->async.dns;
} else { } else {
/* poll for name lookup done with exponential backoff up to 250ms */ /* poll for name lookup done with exponential backoff up to 250ms */
int elapsed; int elapsed = Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle);
if (elapsed < 0)
elapsed = Curl_tvdiff(Curl_tvnow(), data->progress.t_startsingle);
if (elapsed < 0) {
elapsed = 0; elapsed = 0;
}
if (td->poll_interval == 0) { if (td->poll_interval == 0)
/* Start at 1ms poll interval */ /* Start at 1ms poll interval */
td->poll_interval = 1; td->poll_interval = 1;
} else if (elapsed >= td->interval_end) { else if (elapsed >= td->interval_end)
/* Back-off exponentially if last interval expired */ /* Back-off exponentially if last interval expired */
td->poll_interval *= 2; td->poll_interval *= 2;
}
if (td->poll_interval > 250) if (td->poll_interval > 250)
td->poll_interval = 250; td->poll_interval = 250;
td->interval_end = elapsed + td->poll_interval; td->interval_end = elapsed + td->poll_interval;
/* Reset old timer so we can set a new one further in the future */
Curl_expire(conn->data, 0);
Curl_expire(conn->data, td->poll_interval); Curl_expire(conn->data, td->poll_interval);
} }