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

calculate upload and download speed using doubles to keep precision.

Browse Source 
deleted trailing whitespace
This commit is contained in:
Daniel Stenberg 2004-05-20 20:35:42 +00:00
parent ff52ba7f7b
commit 60f9450594
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/progress.c
View File

@ -1,8 +1,8 @@
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
* / __| | | | |_) | | * / __| | | | |_) | |
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
@ -10,7 +10,7 @@
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html. * are also available at http://curl.haxx.se/docs/copyright.html.
* *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell * You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is * copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file. * furnished to do so, under the terms of the COPYING file.
@ -119,7 +119,7 @@ static char *max5data(curl_off_t bytes, char *max5)
return max5; return max5;
} }
/* /*
New proposed interface, 9th of February 2000: New proposed interface, 9th of February 2000:
@ -272,15 +272,17 @@ int Curl_pgrsUpdate(struct connectdata *conn)
timespent = (long)data->progress.timespent; timespent = (long)data->progress.timespent;
/* The average download speed this far */ /* The average download speed this far */
data->progress.dlspeed = data->progress.dlspeed = (curl_off_t)
data->progress.downloaded/(timespent?timespent:1); (data->progress.downloaded/(data->progress.timespent>0?
data->progress.timespent:1));
/* The average upload speed this far */ /* The average upload speed this far */
data->progress.ulspeed = data->progress.ulspeed = (curl_off_t)
data->progress.uploaded/(timespent?timespent:1); (data->progress.uploaded/(data->progress.timespent>0?
data->progress.timespent:1));
if(data->progress.lastshow == Curl_tvlong(now)) if(data->progress.lastshow == Curl_tvlong(now))
return 0; /* never update this more than once a second if the end isn't return 0; /* never update this more than once a second if the end isn't
reached */ reached */
data->progress.lastshow = now.tv_sec; data->progress.lastshow = now.tv_sec;
@ -373,7 +375,7 @@ int Curl_pgrsUpdate(struct connectdata *conn)
dlpercen = (long)(100*(data->progress.downloaded/100) / dlpercen = (long)(100*(data->progress.downloaded/100) /
(data->progress.size_dl/100)); (data->progress.size_dl/100));
} }
/* Now figure out which of them that is slower and use for the for /* Now figure out which of them that is slower and use for the for
total estimate! */ total estimate! */
total_estimate = ulestimate>dlestimate?ulestimate:dlestimate; total_estimate = ulestimate>dlestimate?ulestimate:dlestimate;
@ -384,12 +386,12 @@ int Curl_pgrsUpdate(struct connectdata *conn)
time2str(time_spent, timespent); time2str(time_spent, timespent);
/* Get the total amount of data expected to get transfered */ /* Get the total amount of data expected to get transfered */
total_expected_transfer = total_expected_transfer =
(data->progress.flags & PGRS_UL_SIZE_KNOWN? (data->progress.flags & PGRS_UL_SIZE_KNOWN?
data->progress.size_ul:data->progress.uploaded)+ data->progress.size_ul:data->progress.uploaded)+
(data->progress.flags & PGRS_DL_SIZE_KNOWN? (data->progress.flags & PGRS_DL_SIZE_KNOWN?
data->progress.size_dl:data->progress.downloaded); data->progress.size_dl:data->progress.downloaded);
/* We have transfered this much so far */ /* We have transfered this much so far */
total_transfer = data->progress.downloaded + data->progress.uploaded; total_transfer = data->progress.downloaded + data->progress.uploaded;