romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 14:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: rename curlx_timediff to curlx_timeleft_ms

Browse source 
Rename `Curl_timeleft()` to `Curl_timeleft_ms()` to make the units in
the returned `timediff_t` clear. (We used to always have ms there, but
with QUIC started to sometimes calc ns as well).

Rename some assigned vars without `_ms` suffix for clarity as well.

Closes #19486
This commit is contained in:
Stefan Eissing 2025-11-12 12:15:42 +01:00 • committed by Daniel Stenberg
parent ca27404d27
commit 78a610cb83
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
53 changed files with 187 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tool_cb_prg.c
View file

@ -171,13 +171,13 @@ int tool_progress_cb(void *clientp,
if(bar->prev == point)
/* progress did not change since last invoke */
return 0;
else if((curlx_timediff(now, bar->prevtime) < 100L) && point < total)
else if((curlx_timediff_ms(now, bar->prevtime) < 100L) && point < total)
/* limit progress-bar updating to 10 Hz except when we are at 100% */
return 0;
}
else {
/* total is unknown */
if(curlx_timediff(now, bar->prevtime) < 100L)
if(curlx_timediff_ms(now, bar->prevtime) < 100L)
/* limit progress-bar updating to 10 Hz */
return 0;
update_width(bar);

2
src/tool_cb_rea.c
View file

@ -101,7 +101,7 @@ size_t tool_read_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
if(config->timeout_ms) {
struct curltime now = curlx_now();
long msdelta = (long)curlx_timediff(now, per->start);
long msdelta = (long)curlx_timediff_ms(now, per->start);
if(msdelta > config->timeout_ms)
/* timeout */

6
src/tool_operate.c
View file

@ -476,7 +476,7 @@ static CURLcode retrycheck(struct OperationConfig *config,
maximum time allowed for retrying, then exit the retries right
away */
if(config->retry_maxtime_ms) {
timediff_t ms = curlx_timediff(curlx_now(), per->retrystart);
timediff_t ms = curlx_timediff_ms(curlx_now(), per->retrystart);
if((CURL_OFF_T_MAX - sleeptime < ms) ||
(ms + sleeptime > config->retry_maxtime_ms)) {
@ -713,7 +713,7 @@ static CURLcode post_per_transfer(struct per_transfer *per,
time */
if(per->retry_remaining &&
(!config->retry_maxtime_ms ||
(curlx_timediff(curlx_now(), per->retrystart) <
(curlx_timediff_ms(curlx_now(), per->retrystart) <
config->retry_maxtime_ms)) ) {
result = retrycheck(config, per, result, retryp, delay);
if(!result && *retryp)
@ -1984,7 +1984,7 @@ static CURLcode serial_transfers(CURLSH *share)
if(per && global->ms_per_transfer) {
/* how long time did the most recent transfer take in number of
milliseconds */
timediff_t milli = curlx_timediff(curlx_now(), start);
timediff_t milli = curlx_timediff_ms(curlx_now(), start);
if(milli < global->ms_per_transfer) {
notef("Transfer took %" CURL_FORMAT_CURL_OFF_T " ms, "
"waits %ldms as set by --rate",

8
src/tool_progress.c
View file

@ -156,7 +156,7 @@ bool progress_meter(CURLM *multi,
return FALSE;
now = curlx_now();
diff = curlx_timediff(now, stamp);
diff = curlx_timediff_ms(now, stamp);
if(!header) {
header = TRUE;
@ -169,7 +169,7 @@ bool progress_meter(CURLM *multi,
char time_total[10];
char time_spent[10];
char buffer[3][6];
curl_off_t spent = curlx_timediff(now, *start)/1000;
curl_off_t spent = curlx_timediff_ms(now, *start)/1000;
char dlpercen[4]="--";
char ulpercen[4]="--";
struct per_transfer *per;
@ -236,13 +236,13 @@ bool progress_meter(CURLM *multi,
curl_off_t uls;
if(indexwrapped) {
/* 'speedindex' is the oldest stored data */
deltams = curlx_timediff(now, speedstore[speedindex].stamp);
deltams = curlx_timediff_ms(now, speedstore[speedindex].stamp);
dl = all_dlnow - speedstore[speedindex].dl;
ul = all_ulnow - speedstore[speedindex].ul;
}
else {
/* since the beginning */
deltams = curlx_timediff(now, *start);
deltams = curlx_timediff_ms(now, *start);
dl = all_dlnow;
ul = all_ulnow;
}