From 4b6c2408327d283a1453c8540367fd00285e5862 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 10 Aug 2001 06:24:49 +0000 Subject: moved the download/upload speed calculations, to be made on every invoke of the progressupdate, as on very quick transfers they wouldn't always get calculated! --- lib/progress.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/progress.c b/lib/progress.c index 08d9c7890..af756a026 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -225,20 +225,19 @@ int Curl_pgrsUpdate(struct connectdata *conn) /* The exact time spent so far */ data->progress.timespent = Curl_tvdiff (now, data->progress.start); - if(data->progress.lastshow == Curl_tvlong(now)) - return 0; /* never update this more than once a second if the end isn't - reached */ - data->progress.lastshow = now.tv_sec; - /* The average download speed this far */ data->progress.dlspeed = data->progress.downloaded/(data->progress.timespent!=0.0?data->progress.timespent:1.0); /* The average upload speed this far */ data->progress.ulspeed = data->progress.uploaded/(data->progress.timespent!=0.0?data->progress.timespent:1.0); + if(data->progress.lastshow == Curl_tvlong(now)) + return 0; /* never update this more than once a second if the end isn't + reached */ + data->progress.lastshow = now.tv_sec; + /* Let's do the "current speed" thing, which should use the fastest of the dl/ul speeds */ - data->progress.speeder[ nowindex ] = data->progress.downloaded>data->progress.uploaded? data->progress.downloaded:data->progress.uploaded; -- cgit v1.2.3