moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-11 07:39:50 -04:00
Code Issues Releases Wiki Activity

made 'timespent' a double, which makes more accurate calculations for quick

Browse Source 
downloads
This commit is contained in:
Daniel Stenberg 2001-10-26 11:25:03 +00:00
parent b22a5f756c
commit babb985f1a
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/progress.c
View File

@ -187,6 +187,7 @@ int Curl_pgrsUpdate(struct connectdata *conn)
double total_transfer; double total_transfer;
double total_expected_transfer; double total_expected_transfer;
double timespent;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
@ -224,17 +225,17 @@ int Curl_pgrsUpdate(struct connectdata *conn)
now = Curl_tvnow(); /* what time is it */ now = Curl_tvnow(); /* what time is it */
/* The exact time spent so far (from the start) */ /* The exact time spent so far (from the start) */
data->progress.timespent = Curl_tvdiff (now, data->progress.start)/1000; timespent = (double)Curl_tvdiff (now, data->progress.start)/1000;
data->progress.timespent = (long)timespent;
/* The average download speed this far */ /* The average download speed this far */
data->progress.dlspeed = data->progress.dlspeed =
data->progress.downloaded/(data->progress.timespent? data->progress.downloaded/(timespent>0.01?timespent:1);
data->progress.timespent:1);
/* The average upload speed this far */ /* The average upload speed this far */
data->progress.ulspeed = data->progress.ulspeed =
data->progress.uploaded/(data->progress.timespent? data->progress.uploaded/(timespent>0.01?timespent:1);
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
@ -281,8 +282,10 @@ int Curl_pgrsUpdate(struct connectdata *conn)
data->progress.speeder[checkindex])/((double)span_ms/1000); data->progress.speeder[checkindex])/((double)span_ms/1000);
} }
else else
/* the first second we only have one speed information to use */ /* the first second we use the main average */
data->progress.current_speed = data->progress.speeder[nowindex]; data->progress.current_speed =
(data->progress.ulspeed>data->progress.dlspeed)?
data->progress.ulspeed:data->progress.dlspeed;
if(data->progress.flags & PGRS_HIDE) if(data->progress.flags & PGRS_HIDE)
return 0; return 0;