Unverified Commit 85f9aa08 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

conncache_unlock: avoid indirection by changing input argument type

parent fb445a1e

lib/conncache.c

+2 −2
Original line number Diff line number Diff line
@@ -178,9 +178,9 @@ static void hashkey(struct connectdata *conn, char *buf, 
  msnprintf(buf, len, "%ld%s", conn->port, hostname);

}



void Curl_conncache_unlock(struct connectdata *conn)

void Curl_conncache_unlock(struct Curl_easy *data)

{

  CONN_UNLOCK(conn->data);

  CONN_UNLOCK(data);

}



/* Returns number of connections currently held in the connection cache.

lib/conncache.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void Curl_conncache_destroy(struct conncache *connc); 
/* return the correct bundle, to a host or a proxy */

struct connectbundle *Curl_conncache_find_bundle(struct connectdata *conn,

                                                 struct conncache *connc);

void Curl_conncache_unlock(struct connectdata *conn);

void Curl_conncache_unlock(struct Curl_easy *data);

/* returns number of connections currently held in the connection cache */

size_t Curl_conncache_size(struct Curl_easy *data);

size_t Curl_conncache_bundle_size(struct connectdata *conn);

lib/url.c

+5 −5
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ ConnectionExists(struct Curl_easy *data, 
        if((bundle->multiuse == BUNDLE_UNKNOWN) && data->set.pipewait) {

          infof(data, "Server doesn't support multi-use yet, wait\n");

          *waitpipe = TRUE;

          Curl_conncache_unlock(needle);

          Curl_conncache_unlock(data);

          return FALSE; /* no re-use */

        }
@@ -1457,11 +1457,11 @@ ConnectionExists(struct Curl_easy *data, 
  if(chosen) {

    /* mark it as used before releasing the lock */

    chosen->data = data; /* own it! */

    Curl_conncache_unlock(needle);

    Curl_conncache_unlock(data);

    *usethis = chosen;

    return TRUE; /* yes, we found one to use! */

  }

  Curl_conncache_unlock(needle);

  Curl_conncache_unlock(data);



  if(foundPendingCandidate && data->set.pipewait) {

    infof(data,
@@ -3950,7 +3950,7 @@ static CURLcode create_conn(struct Curl_easy *data, 


        /* The bundle is full. Extract the oldest connection. */

        conn_candidate = Curl_conncache_extract_bundle(data, bundle);

        Curl_conncache_unlock(conn);

        Curl_conncache_unlock(data);



        if(conn_candidate)

          (void)Curl_disconnect(data, conn_candidate,
@@ -3962,7 +3962,7 @@ static CURLcode create_conn(struct Curl_easy *data, 
        }

      }

      else

        Curl_conncache_unlock(conn);

        Curl_conncache_unlock(data);



    }