Commit e9fd794a authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

multi: assign IDs to all timers and make each timer singleton 

 A) reduces the timeout lists drastically

 B) prevents a lot of superfluous loops for timers that expires "in vain"
    when it has actually already been extended to fire later on
parent 8dfa378e

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);

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



  return max;

}

lib/connect.c

+3 −3
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
@@ -1070,7 +1070,7 @@ static CURLcode singleipconnect(struct connectdata *conn, 


  conn->connecttime = Curl_tvnow();

  if(conn->num_addr > 1)

    Curl_expire_latest(data, conn->timeoutms_per_addr);

    Curl_expire_latest(data, conn->timeoutms_per_addr, EXPIRE_DNS_PER_NAME);



  /* Connect TCP sockets, bind UDP */

  if(!isconnected && (conn->socktype == SOCK_STREAM)) {
@@ -1169,7 +1169,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ 
  conn->tempaddr[1] = NULL;

  conn->tempsock[0] = CURL_SOCKET_BAD;

  conn->tempsock[1] = CURL_SOCKET_BAD;

  Curl_expire(conn->data, HAPPY_EYEBALLS_TIMEOUT);

  Curl_expire(conn->data, HAPPY_EYEBALLS_TIMEOUT, EXPIRE_HAPPY_EYEBALLS);



  /* Max time for the next connection attempt */

  conn->timeoutms_per_addr =

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); /* get this handle going again */

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



  return result;

}

lib/ftp.c

+2 −4
Original line number Diff line number Diff line
@@ -580,10 +580,8 @@ static CURLcode AllowServerConnect(struct connectdata *conn, bool *connected) 
  else {

    /* Add timeout to multi handle and break out of the loop */

    if(!result && *connected == FALSE) {

      if(data->set.accepttimeout > 0)

        Curl_expire(data, data->set.accepttimeout);

      else

        Curl_expire(data, DEFAULT_ACCEPT_TIMEOUT);

      Curl_expire(data, data->set.accepttimeout > 0 ?

                  data->set.accepttimeout: DEFAULT_ACCEPT_TIMEOUT, 0);

    }

  }

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);

        Curl_expire(data_s, 0, EXPIRE_H2DATA);

    }

    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);

    Curl_expire(data_s, 0, EXPIRE_H2DATA);



  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);

      Curl_expire(data_s, 0, EXPIRE_H2DATA);



    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);

    Curl_expire(data_s, 0, EXPIRE_H2DATA);



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

               value));