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

progress: fx CURLINFO time reporting

Browse source 
Whack the times reported for a transfer (see
https://curl.se/libcurl/c/curl_easy_getinfo.html#TIMES) into order for
all variations of up-/download, http/ftp etc. Make sure they are
reported in the documented order.

There is still the *possibility* of PRETRANSFER being longer then
POSTTRANSFER, if a server sends a response before an upload is done.
POST is the time the first response byte is received, and PRE is the
time the last byte was sent by curl.

This may happen with more likelihood on HTTP/2 and 3 for a server
rejected upload. But for successful uploads, the answer will almost over
come afterwards.

Undo the previous twists in lib500.c tests, adjust pytest timeline
checks.

Fixes #21828
Reported-by: BazaarAcc32 on github
Closes #21843
This commit is contained in:
Stefan Eissing 2026-06-02 11:10:10 +02:00 • committed by Daniel Stenberg
parent 317bf7e8a8
commit fbcf10ab84
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
8 changed files with 159 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

43
lib/progress.c
View file

@ -240,6 +240,30 @@ void Curl_pgrsSendPause(struct Curl_easy *data, bool enable)
}
}
#ifdef CURLVERBOSE
static const char * const pgrs_timer_names[] = {
"PGRS-NONE",
"PGRS-STARTOP",
"PGRS-STARTSINGLE",
"PGRS-POSTQUEUE",
"PGRS-NAMELOOKUP",
"PGRS-CONNECT",
"PGRS-APPCONNECT",
"PGRS-PRETRANSFER",
"PGRS-STARTTRANSFER",
"PGRS-POSTRANSFER",
"PGRS-STARTACCEPT",
"PGRS-REDIRECT",
};
static const char *pgrs_timer_name(timerid timer)
{
if((size_t)timer < CURL_ARRAYSIZE(pgrs_timer_names))
return pgrs_timer_names[(size_t)timer];
return "?";
}
#endif /* CURLVERBOSE */
/*
* Curl_pgrsTimeWas(). Store the timestamp time at the given label.
*/
@ -285,7 +309,6 @@ void Curl_pgrsTimeWas(struct Curl_easy *data, timerid timer,
delta = &data->progress.t_pretransfer;
break;
case TIMER_STARTTRANSFER:
delta = &data->progress.t_starttransfer;
/* prevent updating t_starttransfer unless:
* 1. this is the first time we are setting t_starttransfer
* 2. a redirect has occurred since the last time t_starttransfer was set
@ -293,12 +316,12 @@ void Curl_pgrsTimeWas(struct Curl_easy *data, timerid timer,
* changing the t_starttransfer time.
*/
if(data->progress.is_t_startransfer_set) {
CURL_TRC_M(data, "[%s] ignored", pgrs_timer_name(timer));
return;
}
else {
data->progress.is_t_startransfer_set = TRUE;
break;
}
data->progress.is_t_startransfer_set = TRUE;
delta = &data->progress.t_starttransfer;
break;
case TIMER_POSTRANSFER:
delta = &data->progress.t_posttransfer;
break;
@ -314,7 +337,11 @@ void Curl_pgrsTimeWas(struct Curl_easy *data, timerid timer,
if(us < 1)
us = 1; /* make sure at least one microsecond passed */
*delta += us;
CURL_TRC_M(data, "[%s] added %" FMT_TIMEDIFF_T "ns",
pgrs_timer_name(timer), us);
}
else
CURL_TRC_M(data, "[%s] set", pgrs_timer_name(timer));
}
/*
@ -703,3 +730,9 @@ void Curl_pgrsUpdate_nometer(struct Curl_easy *data)
{
(void)progress_calc(data, Curl_pgrs_now(data));
}
void Curl_pgrsCompleted(struct Curl_easy *data)
{
struct Progress * const p = &data->progress;
p->timespent = curlx_ptimediff_us(Curl_pgrs_now(data), &p->start);
}