Commit 013d5c18 authored by Carlo Wood's avatar Carlo Wood Committed by Daniel Stenberg
Browse files

debug: added new connection cache output, plus fixups 

Debug output 'typo' fix.

Don't print an extra "0x" in
  * Pipe broke: handle 0x0x2546d88, url = /

Add debug output.
Print the number of connections in the connection cache when
  adding one, and not only when one is removed.

Fix typos in comments.
parent b77ff4d5

lib/conncache.c

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,10 @@ CURLcode Curl_conncache_add_conn(struct conncache *connc, 
  conn->connection_id = connc->next_connection_id++;

  connc->num_connections++;



  DEBUGF(infof(conn->data, "Added connection %d. "

               "The cache now contains %d members\n",

               conn->connection_id, connc->num_connections));



  return CURLE_OK;

}

lib/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ CURLcode Curl_socket(struct connectdata *conn, 
#ifdef CURLDEBUG

/*

 * Curl_conncontrol() is used to set the conn->bits.close bit on or off. It

 * MUST be called with the connclose() or connclose() macros with a stated

 * MUST be called with the connclose() or connkeep() macros with a stated

 * reason. The reason is only shown in debug builds but helps to figure out

 * decision paths when connections are or aren't re-used as expected.

 */

lib/multi.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle, 
       connection. */

    connclose(data->easy_conn, "Removed with partial response");

    /* Set connection owner so that Curl_done() closes it.

       We can sefely do this here since connection is killed. */

       We can safely do this here since connection is killed. */

    data->easy_conn->data = easy;

    easy_owns_conn = TRUE;

  }
@@ -944,7 +944,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, 
    /* Handle the case when the pipe breaks, i.e., the connection

       we're using gets cleaned up and we're left with nothing. */

    if(data->state.pipe_broke) {

      infof(data, "Pipe broke: handle 0x%p, url = %s\n",

      infof(data, "Pipe broke: handle %p, url = %s\n",

            (void *)data, data->state.path);



      if(data->mstate < CURLM_STATE_COMPLETED) {