Commit 31b39c40 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

multi: use a fixed array of timers instead of malloc 

... since the total amount is low this is faster, easier and reduces
memory overhead.

Also, Curl_expire_done() can now mark an expire timeout as done so that
it never times out.

Closes #1472
parent e9fd794a

lib/asyn-ares.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ int Curl_resolver_getsock(struct connectdata *conn, 
  milli = (timeout->tv_sec * 1000) + (timeout->tv_usec/1000);

  if(milli == 0)

    milli += 10;

  Curl_expire_latest(conn->data, milli, EXPIRE_ARES);

  Curl_expire_latest(conn->data, milli, EXPIRE_ASYNC_NAME);



  return max;

}

lib/asyn-thread.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -540,7 +540,7 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn, 
      td->poll_interval = 250;



    td->interval_end = elapsed + td->poll_interval;

    Curl_expire(conn->data, td->poll_interval);

    Curl_expire(conn->data, td->poll_interval, EXPIRE_ASYNC_NAME);

  }



  return CURLE_OK;

lib/easy.c

+1 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action) 
  if(!result &&

     ((newstate&(KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=

      (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) )

    Curl_expire(data, 0, EXPIRE_UNPAUSE); /* get this handle going again */

    Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */



  return result;

}

lib/http.c

+3 −0
Original line number Diff line number Diff line
@@ -2746,6 +2746,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
      data->req.upload_done = TRUE;

      data->req.keepon &= ~KEEP_SEND; /* we're done writing */

      data->req.exp100 = EXP100_SEND_DATA; /* already sent */

      Curl_expire_done(data, EXPIRE_100_TIMEOUT);

    }

  }
@@ -3042,6 +3043,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, 
          if(k->exp100 > EXP100_SEND_DATA) {

            k->exp100 = EXP100_SEND_DATA;

            k->keepon |= KEEP_SEND;

            Curl_expire_done(data, EXPIRE_100_TIMEOUT);

          }

          break;

        case 101:
@@ -3168,6 +3170,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, 
             * request body has been sent we stop sending and mark the

             * connection for closure after we've read the entire response.

             */

            Curl_expire_done(data, EXPIRE_100_TIMEOUT);

            if(!k->upload_done) {

              if(data->set.http_keep_sending_on_error) {

                infof(data, "HTTP error before end of send, keep sending\n");

lib/http2.c

+4 −4
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, 


      /* if we receive data for another handle, wake that up */

      if(conn_s->data != data_s)

        Curl_expire(data_s, 0, EXPIRE_H2DATA);

        Curl_expire(data_s, 0, EXPIRE_RUN_NOW);

    }

    break;

  case NGHTTP2_PUSH_PROMISE:
@@ -646,7 +646,7 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags, 


  /* if we receive data for another handle, wake that up */

  if(conn->data != data_s)

    Curl_expire(data_s, 0, EXPIRE_H2DATA);

    Curl_expire(data_s, 0, EXPIRE_RUN_NOW);



  DEBUGF(infof(data_s, "%zu data received for stream %u "

               "(%zu left in buffer %p, total %zu)\n",
@@ -909,7 +909,7 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, 
    Curl_add_buffer(stream->header_recvbuf, " \r\n", 3);

    /* if we receive data for another handle, wake that up */

    if(conn->data != data_s)

      Curl_expire(data_s, 0, EXPIRE_H2DATA);

      Curl_expire(data_s, 0, EXPIRE_RUN_NOW);



    DEBUGF(infof(data_s, "h2 status: HTTP/2 %03d (easy %p)\n",

                 stream->status_code, data_s));
@@ -925,7 +925,7 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, 
  Curl_add_buffer(stream->header_recvbuf, "\r\n", 2);

  /* if we receive data for another handle, wake that up */

  if(conn->data != data_s)

    Curl_expire(data_s, 0, EXPIRE_H2DATA);

    Curl_expire(data_s, 0, EXPIRE_RUN_NOW);



  DEBUGF(infof(data_s, "h2 header: %.*s: %.*s\n", namelen, name, valuelen,

               value));