diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-04-27 00:33:21 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-04-30 14:27:54 +0200 |
| commit | c06902713998d68202c5a764de910ba8d0e8f54d (patch) | |
| tree | bc7f53131c6b294af2b0475ed83349d0dcee8a3d /lib/conncache.h | |
| parent | 9a8fa076bff31b55b6d12c0c6da7448ec4ecdf67 (diff) | |
| download | curl-c06902713998d68202c5a764de910ba8d0e8f54d.tar.gz | |
conncache: various concept cleanups
More connection cache accesses are protected by locks.
CONNCACHE_* is a beter prefix for the connection cache lock macros.
Curl_attach_connnection: now called as soon as there's a connection
struct available and before the connection is added to the connection
cache.
Curl_disconnect: now assumes that the connection is already removed from
the connection cache.
Ref: #4915
Closes #5009
Diffstat (limited to 'lib/conncache.h')
| -rw-r--r-- | lib/conncache.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/conncache.h b/lib/conncache.h index e3e4c9c28..3dda21cdc 100644 --- a/lib/conncache.h +++ b/lib/conncache.h @@ -45,21 +45,21 @@ struct conncache { #ifdef CURLDEBUG /* the debug versions of these macros make extra certain that the lock is never doubly locked or unlocked */ -#define CONN_LOCK(x) if((x)->share) { \ +#define CONNCACHE_LOCK(x) if((x)->share) { \ Curl_share_lock((x), CURL_LOCK_DATA_CONNECT, CURL_LOCK_ACCESS_SINGLE); \ DEBUGASSERT(!(x)->state.conncache_lock); \ (x)->state.conncache_lock = TRUE; \ } -#define CONN_UNLOCK(x) if((x)->share) { \ +#define CONNCACHE_UNLOCK(x) if((x)->share) { \ DEBUGASSERT((x)->state.conncache_lock); \ (x)->state.conncache_lock = FALSE; \ Curl_share_unlock((x), CURL_LOCK_DATA_CONNECT); \ } #else -#define CONN_LOCK(x) if((x)->share) \ +#define CONNCACHE_LOCK(x) if((x)->share) \ Curl_share_lock((x), CURL_LOCK_DATA_CONNECT, CURL_LOCK_ACCESS_SINGLE) -#define CONN_UNLOCK(x) if((x)->share) \ +#define CONNCACHE_UNLOCK(x) if((x)->share) \ Curl_share_unlock((x), CURL_LOCK_DATA_CONNECT) #endif @@ -77,7 +77,6 @@ void Curl_conncache_destroy(struct conncache *connc); struct connectbundle *Curl_conncache_find_bundle(struct connectdata *conn, struct conncache *connc, const char **hostp); -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); |