Commit 0d1fc73f authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Use more curl_off_t variables when doing the progress meter calculations and 

argument passing and try to convert to double only when providing data to the
external world.
parent 50a18535

lib/file.c

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ CURLcode Curl_file(struct connectdata *conn) 
     it avoids problems with select() and recv() on file descriptors

     in Winsock */

  if(fstated)

    Curl_pgrsSetDownloadSize(data, (double)expected_size);

    Curl_pgrsSetDownloadSize(data, expected_size);



  if(conn->resume_from)

    lseek(fd, conn->resume_from, SEEK_SET);
@@ -268,7 +268,7 @@ CURLcode Curl_file(struct connectdata *conn) 
    if(res)

      return res;



    Curl_pgrsSetDownloadCounter(data, (double)bytecount);

    Curl_pgrsSetDownloadCounter(data, bytecount);



    if(Curl_pgrsUpdate(conn))

      res = CURLE_ABORTED_BY_CALLBACK;

lib/ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -1821,7 +1821,7 @@ CURLcode Curl_ftp_nextconnect(struct connectdata *conn) 
    /* When we know we're uploading a specified file, we can get the file

       size prior to the actual upload. */



    Curl_pgrsSetUploadSize(data, (double)data->set.infilesize);

    Curl_pgrsSetUploadSize(data, data->set.infilesize);



    result = Curl_Transfer(conn, -1, -1, FALSE, NULL, /* no download */

                           SECONDARYSOCKET, bytecountp);

lib/getinfo.c

+4 −4
Original line number Diff line number Diff line
@@ -135,10 +135,10 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...) 
    *param_doublep = data->progress.t_starttransfer;

    break;

  case CURLINFO_SIZE_UPLOAD:

    *param_doublep =  data->progress.uploaded;

    *param_doublep =  (double)data->progress.uploaded;

    break;

  case CURLINFO_SIZE_DOWNLOAD:

    *param_doublep = data->progress.downloaded;

    *param_doublep = (double)data->progress.downloaded;

    break;

  case CURLINFO_SPEED_DOWNLOAD:

    *param_doublep =  data->progress.dlspeed;
@@ -150,10 +150,10 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...) 
    *param_longp = data->set.ssl.certverifyresult;

    break;

  case CURLINFO_CONTENT_LENGTH_DOWNLOAD:

    *param_doublep = data->progress.size_dl;

    *param_doublep = (double)data->progress.size_dl;

    break;

  case CURLINFO_CONTENT_LENGTH_UPLOAD:

    *param_doublep = data->progress.size_ul;

    *param_doublep = (double)data->progress.size_ul;

    break;

  case CURLINFO_REDIRECT_TIME:

    *param_doublep =  data->progress.t_redirect;

lib/http.c

+2 −2
Original line number Diff line number Diff line
@@ -1563,7 +1563,7 @@ CURLcode Curl_http(struct connectdata *conn) 
      add_buffer(req_buffer, "\r\n", 2); /* end of headers */



      /* set the upload size to the progress meter */

      Curl_pgrsSetUploadSize(data, (double)data->set.infilesize);

      Curl_pgrsSetUploadSize(data, data->set.infilesize);



      /* this sends the buffer and frees all the buffer resources */

      result = add_buffer_send(req_buffer, conn,
@@ -1657,7 +1657,7 @@ CURLcode Curl_http(struct connectdata *conn) 
        add_buffer(req_buffer, "\r\n", 2); /* end of headers! */



        /* set the upload size to the progress meter */

        Curl_pgrsSetUploadSize(data, (double)data->set.infilesize);

        Curl_pgrsSetUploadSize(data, data->set.infilesize);



        /* set the pointer to mark that we will send the post body using

           the read callback */

lib/progress.c

+16 −16
Original line number Diff line number Diff line
@@ -165,17 +165,17 @@ void Curl_pgrsStartNow(struct SessionHandle *data) 
  data->progress.start = Curl_tvnow();

}



void Curl_pgrsSetDownloadCounter(struct SessionHandle *data, double size)

void Curl_pgrsSetDownloadCounter(struct SessionHandle *data, curl_off_t size)

{

  data->progress.downloaded = size;

}



void Curl_pgrsSetUploadCounter(struct SessionHandle *data, double size)

void Curl_pgrsSetUploadCounter(struct SessionHandle *data, curl_off_t size)

{

  data->progress.uploaded = size;

}



void Curl_pgrsSetDownloadSize(struct SessionHandle *data, double size)

void Curl_pgrsSetDownloadSize(struct SessionHandle *data, curl_off_t size)

{

  data->progress.size_dl = size;

  if(size > 0)
@@ -184,7 +184,7 @@ void Curl_pgrsSetDownloadSize(struct SessionHandle *data, double size) 
    data->progress.flags &= ~PGRS_DL_SIZE_KNOWN;

}



void Curl_pgrsSetUploadSize(struct SessionHandle *data, double size)

void Curl_pgrsSetUploadSize(struct SessionHandle *data, curl_off_t size)

{

  data->progress.size_ul = size;

  if(size > 0)
@@ -211,8 +211,8 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
  double ulpercen=0;

  double total_percen=0;



  double total_transfer;

  double total_expected_transfer;

  curl_off_t total_transfer;

  curl_off_t total_expected_transfer;

  double timespent;



  struct SessionHandle *data = conn->data;
@@ -259,7 +259,7 @@ int Curl_pgrsUpdate(struct connectdata *conn) 


  /* The average download speed this far */

  data->progress.dlspeed =

    data->progress.downloaded/(timespent>0.01?timespent:1);

    data->progress.downloaded/(timespent>0.01?timespent:1.0);



  /* The average upload speed this far */

  data->progress.ulspeed =
@@ -324,10 +324,10 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
    /* There's a callback set, so we call that instead of writing

       anything ourselves. This really is the way to go. */

    result= data->set.fprogress(data->set.progress_client,

                                data->progress.size_dl,

                                data->progress.downloaded,

                                data->progress.size_ul,

                                data->progress.uploaded);

                                (double)data->progress.size_dl,

                                (double)data->progress.downloaded,

                                (double)data->progress.size_ul,

                                (double)data->progress.uploaded);

    if(result)

      failf(data, "Callback aborted");

    return result;
@@ -336,15 +336,15 @@ int Curl_pgrsUpdate(struct connectdata *conn) 
  /* Figure out the estimated time of arrival for the upload */

  if((data->progress.flags & PGRS_UL_SIZE_KNOWN) &&

     (data->progress.ulspeed > 0)) {

    ulestimate = data->progress.size_ul / data->progress.ulspeed;

    ulpercen = (data->progress.uploaded / data->progress.size_ul)*100;

    ulestimate = (double)data->progress.size_ul / data->progress.ulspeed;

    ulpercen = ((double)data->progress.uploaded / data->progress.size_ul)*100;

  }



  /* ... and the download */

  if((data->progress.flags & PGRS_DL_SIZE_KNOWN) &&

     (data->progress.dlspeed > 0)) {

    dlestimate = data->progress.size_dl / data->progress.dlspeed;

    dlpercen = (data->progress.downloaded / data->progress.size_dl)*100;

    dlestimate = (double)data->progress.size_dl / data->progress.dlspeed;

    dlpercen = ((double)data->progress.downloaded / data->progress.size_dl)*100;

  }

    

  /* Now figure out which of them that is slower and use for the for
@@ -378,7 +378,7 @@ int Curl_pgrsUpdate(struct connectdata *conn) 


  /* Get the percentage of data transfered so far */

  if(total_expected_transfer > 0)

    total_percen=(double)(total_transfer/total_expected_transfer)*100;

    total_percen=((double)total_transfer/total_expected_transfer)*100;



  fprintf(data->set.err,

          "\r%3d %s  %3d %s  %3d %s  %s  %s %s %s %s %s",