generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- I fixed several problems with the transfer progress meter. It showed the

Browse Source 
wrong percentage for small files, most notable for <1000 bytes and could
  easily end up showing more than 100% at the end. It also didn't show any
  percentage, transfer size or estimated transfer times when transferring
  less than 100 bytes.
This commit is contained in:
Daniel Stenberg
2009-11-04 23:09:17 +00:00
parent 1d8d389bce
commit 257f2376d5
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/progress.c
View File

@@ -370,21 +370,29 @@ int Curl_pgrsUpdate(struct connectdata *conn)
}
/* Figure out the estimated time of arrival for the upload */
if((data->progress.flags & PGRS_UL_SIZE_KNOWN) &&
(data->progress.ulspeed > CURL_OFF_T_C(0)) &&
(data->progress.size_ul > CURL_OFF_T_C(100)) ) {
if((data->progress.flags & PGRS_UL_SIZE_KNOWN) &&
(data->progress.ulspeed > CURL_OFF_T_C(0))) {
ulestimate = data->progress.size_ul / data->progress.ulspeed;
ulpercen = data->progress.uploaded /
(data->progress.size_ul/CURL_OFF_T_C(100));
if(data->progress.size_ul > CURL_OFF_T_C(10000) )
ulpercen = data->progress.uploaded /
(data->progress.size_ul/CURL_OFF_T_C(100));
else
ulpercen = (data->progress.uploaded*100) /
data->progress.size_ul;
}
/* ... and the download */
if((data->progress.flags & PGRS_DL_SIZE_KNOWN) &&
(data->progress.dlspeed > CURL_OFF_T_C(0)) &&
(data->progress.size_dl > CURL_OFF_T_C(100))) {
(data->progress.dlspeed > CURL_OFF_T_C(0)) ) {
dlestimate = data->progress.size_dl / data->progress.dlspeed;
dlpercen = data->progress.downloaded /
(data->progress.size_dl/CURL_OFF_T_C(100));
if(data->progress.size_dl > CURL_OFF_T_C(10000))
dlpercen = data->progress.downloaded /
(data->progress.size_dl/CURL_OFF_T_C(100));
else
dlpercen = (data->progress.downloaded*100) /
data->progress.size_dl;
}
/* Now figure out which of them is slower and use that one for the
@@ -407,9 +415,11 @@ int Curl_pgrsUpdate(struct connectdata *conn)
total_transfer = data->progress.downloaded + data->progress.uploaded;
/* Get the percentage of data transfered so far */
if(total_expected_transfer > CURL_OFF_T_C(100))
if(total_expected_transfer > CURL_OFF_T_C(10000))
total_percen = total_transfer /
(total_expected_transfer/CURL_OFF_T_C(100));
(total_expected_transfer/CURL_OFF_T_C(100));
else if(total_expected_transfer > 0)
total_percen = (total_transfer*100) / total_expected_transfer;
fprintf(data->set.err,
"\r"