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

Dirk Manske's feedback:

Browse Source 
* bring back subsecond resolution to CURLINFO_TOTAL_TIME
* Fix the Curl_pgrsDone() so that the final progress update is shown properly
This commit is contained in:
Daniel Stenberg 2004-04-02 07:32:03 +00:00
parent 03def138fe
commit 7ba4d3464f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/progress.c
View File

@ -117,13 +117,12 @@ static char *max5data(curl_off_t bytes, char *max5)
void Curl_pgrsDone(struct connectdata *conn) void Curl_pgrsDone(struct connectdata *conn)
{ {
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
if(!(data->progress.flags & PGRS_HIDE)) { data->progress.lastshow=0;
data->progress.lastshow=0; Curl_pgrsUpdate(conn); /* the final (forced) update */
Curl_pgrsUpdate(conn); /* the final (forced) update */ if(!(data->progress.flags & PGRS_HIDE) &&
if(!data->progress.callback) !data->progress.callback)
/* only output if we don't use progress callback */ /* only output if we don't use a progress callback and we're not hidden */
fprintf(data->set.err, "\n"); fprintf(data->set.err, "\n");
}
} }
/* reset all times except redirect */ /* reset all times except redirect */
@ -250,9 +249,8 @@ int Curl_pgrsUpdate(struct connectdata *conn)
now = Curl_tvnow(); /* what time is it */ now = Curl_tvnow(); /* what time is it */
/* The time spent so far (from the start) */ /* The time spent so far (from the start) */
timespent = Curl_tvdiff(now, data->progress.start)/1000; data->progress.timespent = Curl_tvdiff(now, data->progress.start)/1000.0;
timespent = (long)data->progress.timespent;
data->progress.timespent = (double)timespent;
/* The average download speed this far */ /* The average download speed this far */
data->progress.dlspeed = data->progress.dlspeed =