Commit 7ba4d346 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Dirk Manske's feedback: 

* bring back subsecond resolution to CURLINFO_TOTAL_TIME
* Fix the Curl_pgrsDone() so that the final progress update is shown properly
parent 03def138

lib/progress.c

+8 −10
Original line number Diff line number Diff line
@@ -117,14 +117,13 @@ static char *max5data(curl_off_t bytes, char *max5) 
void Curl_pgrsDone(struct connectdata *conn)

{

  struct SessionHandle *data = conn->data;

  if(!(data->progress.flags & PGRS_HIDE)) {

  data->progress.lastshow=0;

  Curl_pgrsUpdate(conn); /* the final (forced) update */

    if(!data->progress.callback)

      /* only output if we don't use progress callback */

  if(!(data->progress.flags & PGRS_HIDE) &&

     !data->progress.callback)

    /* only output if we don't use a progress callback and we're not hidden */

    fprintf(data->set.err, "\n");

}

}



/* reset all times except redirect */

void Curl_pgrsResetTimes(struct SessionHandle *data)
@@ -250,9 +249,8 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
  now = Curl_tvnow(); /* what time is it */



  /* The time spent so far (from the start) */

  timespent = Curl_tvdiff(now, data->progress.start)/1000;



  data->progress.timespent = (double)timespent;

  data->progress.timespent = Curl_tvdiff(now, data->progress.start)/1000.0;

  timespent = (long)data->progress.timespent;



  /* The average download speed this far */

  data->progress.dlspeed =