moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 00:28:48 -05:00
Code Issues Releases Wiki Activity

progress: move transfer speed calc into function

Browse Source 
This silences two scan-build-11 warnings: "The result of the '/'
expression is undefined"

Bug: https://curl.se/mail/lib-2021-05/0022.html
Closes #7035
This commit is contained in:
Daniel Stenberg 2021-05-08 12:28:38 +02:00
parent 3f25c01fce
commit 7ab54e8f41
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/progress.c
View File

@ -369,37 +369,39 @@ void Curl_pgrsSetUploadSize(struct Curl_easy *data, curl_off_t size)
} }
} }
/* returns the average speed */
static curl_off_t trspeed(curl_off_t size, curl_off_t us)
{
curl_off_t sec;
if(size < CURL_OFF_T_MAX/1000000) {
if(us < 1)
return size * 1000000;
return (size * 1000000) / us;
}
else if(size < CURL_OFF_T_MAX/1000) {
curl_off_t ms = us/1000;
if(ms < 1)
return size * 1000;
return (size * 1000) / ms;
}
sec = us / 1000000;
if(sec < 1)
return size;
return size / sec;
}
/* returns TRUE if it's time to show the progress meter */ /* returns TRUE if it's time to show the progress meter */
static bool progress_calc(struct Curl_easy *data, struct curltime now) static bool progress_calc(struct Curl_easy *data, struct curltime now)
{ {
curl_off_t timespent;
curl_off_t timespent_ms; /* milliseconds */
curl_off_t dl = data->progress.downloaded;
curl_off_t ul = data->progress.uploaded;
bool timetoshow = FALSE; bool timetoshow = FALSE;
/* The time spent so far (from the start) */ /* The time spent so far (from the start) in microseconds */
data->progress.timespent = Curl_timediff_us(now, data->progress.start); data->progress.timespent = Curl_timediff_us(now, data->progress.start);
timespent = (curl_off_t)data->progress.timespent/1000000; /* seconds */ data->progress.dlspeed = trspeed(data->progress.downloaded,
timespent_ms = (curl_off_t)data->progress.timespent/1000; /* ms */ data->progress.timespent);
data->progress.ulspeed = trspeed(data->progress.uploaded,
/* The average download speed this far */ data->progress.timespent);
if(dl < CURL_OFF_T_MAX/1000000)
data->progress.dlspeed =
(dl * 1000000 / (data->progress.timespent?data->progress.timespent:1));
else if(dl < CURL_OFF_T_MAX/1000)
data->progress.dlspeed = (dl * 1000 / (timespent_ms>0?timespent_ms:1));
else
data->progress.dlspeed = (dl / (timespent>0?timespent:1));
/* The average upload speed this far */
if(ul < CURL_OFF_T_MAX/1000000)
data->progress.ulspeed =
(ul * 1000000 / (data->progress.timespent?data->progress.timespent:1));
else if(ul < CURL_OFF_T_MAX/1000)
data->progress.ulspeed = (ul * 1000 / (timespent_ms>0?timespent_ms:1));
else
data->progress.ulspeed = (ul / (timespent>0?timespent:1));
/* Calculations done at most once a second, unless end is reached */ /* Calculations done at most once a second, unless end is reached */
if(data->progress.lastshow != now.tv_sec) { if(data->progress.lastshow != now.tv_sec) {