mirror of
https://github.com/curl/curl.git
synced 2026-08-02 20:30:30 +03:00
time-keeping: keep timestamp in multi, always update
Always use curlx_now() when calling Curl_pgrs_now(data). Tests with the "manual" updates to now proved differ more then 100ms in parallel testing. Add `curlx_nowp()` to set current time into a struct curltime. Add `curlx_ptimediff_ms() and friends, passing pointers. Update documentation. Closes #19998
This commit is contained in:
parent
308c347c8b
commit
b4be1f271e
61 changed files with 471 additions and 502 deletions
|
|
@ -261,7 +261,7 @@ static CURLcode sendrecv_dl(struct Curl_easy *data,
|
|||
|
||||
if(bytestoread && Curl_rlimit_active(&data->progress.dl.rlimit)) {
|
||||
curl_off_t dl_avail = Curl_rlimit_avail(&data->progress.dl.rlimit,
|
||||
&data->progress.now);
|
||||
Curl_pgrs_now(data));
|
||||
/* DEBUGF(infof(data, "dl_rlimit, available=%" FMT_OFF_T, dl_avail));
|
||||
*/
|
||||
/* In case of rate limited downloads: if this loop already got
|
||||
|
|
@ -399,15 +399,15 @@ CURLcode Curl_sendrecv(struct Curl_easy *data)
|
|||
failf(data, "Operation timed out after %" FMT_TIMEDIFF_T
|
||||
" milliseconds with %" FMT_OFF_T " out of %"
|
||||
FMT_OFF_T " bytes received",
|
||||
curlx_timediff_ms(data->progress.now,
|
||||
data->progress.t_startsingle),
|
||||
curlx_ptimediff_ms(Curl_pgrs_now(data),
|
||||
&data->progress.t_startsingle),
|
||||
k->bytecount, k->size);
|
||||
}
|
||||
else {
|
||||
failf(data, "Operation timed out after %" FMT_TIMEDIFF_T
|
||||
" milliseconds with %" FMT_OFF_T " bytes received",
|
||||
curlx_timediff_ms(data->progress.now,
|
||||
data->progress.t_startsingle),
|
||||
curlx_ptimediff_ms(Curl_pgrs_now(data),
|
||||
&data->progress.t_startsingle),
|
||||
k->bytecount);
|
||||
}
|
||||
result = CURLE_OPERATION_TIMEDOUT;
|
||||
|
|
@ -903,7 +903,7 @@ bool Curl_xfer_recv_is_paused(struct Curl_easy *data)
|
|||
CURLcode Curl_xfer_pause_send(struct Curl_easy *data, bool enable)
|
||||
{
|
||||
CURLcode result = CURLE_OK;
|
||||
Curl_rlimit_block(&data->progress.ul.rlimit, enable, &data->progress.now);
|
||||
Curl_rlimit_block(&data->progress.ul.rlimit, enable, Curl_pgrs_now(data));
|
||||
if(!enable && Curl_creader_is_paused(data))
|
||||
result = Curl_creader_unpause(data);
|
||||
Curl_pgrsSendPause(data, enable);
|
||||
|
|
@ -913,7 +913,7 @@ CURLcode Curl_xfer_pause_send(struct Curl_easy *data, bool enable)
|
|||
CURLcode Curl_xfer_pause_recv(struct Curl_easy *data, bool enable)
|
||||
{
|
||||
CURLcode result = CURLE_OK;
|
||||
Curl_rlimit_block(&data->progress.dl.rlimit, enable, &data->progress.now);
|
||||
Curl_rlimit_block(&data->progress.dl.rlimit, enable, Curl_pgrs_now(data));
|
||||
if(!enable && Curl_cwriter_is_paused(data))
|
||||
result = Curl_cwriter_unpause(data);
|
||||
Curl_conn_ev_data_pause(data, enable);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue