romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 16:37:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

curltime: use libcurl time functions in src and tests/server

Browse source 
The curl tool and tests/server used 2 parallel implementations
of libcurl's `Curl_now()` and `Curl_timediff()` functions.

Make them use the libcurl one.

Closes #16653
This commit is contained in:
Viktor Szakats 2025-03-09 13:14:31 +01:00
parent b1faac8039
commit 436d4a360a
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
20 changed files with 129 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/tool_progress.c
View file

@ -141,7 +141,7 @@ curl_off_t all_xfers = 0; /* current total */
struct speedcount {
curl_off_t dl;
curl_off_t ul;
struct timeval stamp;
struct curltime stamp;
};
#define SPEEDCNT 10
static unsigned int speedindex;
@ -153,19 +153,19 @@ static struct speedcount speedstore[SPEEDCNT];
| 6 -- 9.9G 0 2 2 0:00:40 0:00:02 0:00:37 4087M
*/
bool progress_meter(struct GlobalConfig *global,
struct timeval *start,
struct curltime *start,
bool final)
{
static struct timeval stamp;
static struct curltime stamp;
static bool header = FALSE;
struct timeval now;
long diff;
struct curltime now;
timediff_t diff;
if(global->noprogress || global->silent)
return FALSE;
now = tvnow();
diff = tvdiff(now, stamp);
now = curlx_now();
diff = curlx_timediff(now, stamp);
if(!header) {
header = TRUE;
@ -178,7 +178,7 @@ bool progress_meter(struct GlobalConfig *global,
char time_total[10];
char time_spent[10];
char buffer[3][6];
curl_off_t spent = tvdiff(now, *start)/1000;
curl_off_t spent = curlx_timediff(now, *start)/1000;
char dlpercen[4]="--";
char ulpercen[4]="--";
struct per_transfer *per;
@ -239,20 +239,20 @@ bool progress_meter(struct GlobalConfig *global,
}
{
long deltams;
timediff_t deltams;
curl_off_t dl;
curl_off_t ul;
curl_off_t dls;
curl_off_t uls;
if(indexwrapped) {
/* 'speedindex' is the oldest stored data */
deltams = tvdiff(now, speedstore[speedindex].stamp);
deltams = curlx_timediff(now, speedstore[speedindex].stamp);
dl = all_dlnow - speedstore[speedindex].dl;
ul = all_ulnow - speedstore[speedindex].ul;
}
else {
/* since the beginning */
deltams = tvdiff(now, *start);
deltams = curlx_timediff(now, *start);
dl = all_dlnow;
ul = all_ulnow;
}