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 /tests | |
parent | 9a8fa076bff31b55b6d12c0c6da7448ec4ecdf67 (diff) |
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 'tests')
-rw-r--r-- | tests/data/test1554 | 14 | ||||
-rw-r--r-- | tests/unit/unit1620.c | 6 |
2 files changed, 15 insertions, 5 deletions
diff --git a/tests/data/test1554 b/tests/data/test1554 index 06f189724..d3926d916 100644 --- a/tests/data/test1554 +++ b/tests/data/test1554 @@ -29,6 +29,12 @@ run 1: foobar and so on fun! <- Mutex unlock -> Mutex lock <- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock run 1: foobar and so on fun! -> Mutex lock <- Mutex unlock @@ -40,6 +46,10 @@ run 1: foobar and so on fun! <- Mutex unlock -> Mutex lock <- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock run 1: foobar and so on fun! -> Mutex lock <- Mutex unlock @@ -51,6 +61,10 @@ run 1: foobar and so on fun! <- Mutex unlock -> Mutex lock <- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock run 1: foobar and so on fun! -> Mutex lock <- Mutex unlock diff --git a/tests/unit/unit1620.c b/tests/unit/unit1620.c index 6e572c648..b23e5b912 100644 --- a/tests/unit/unit1620.c +++ b/tests/unit/unit1620.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, 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 @@ -73,10 +73,6 @@ UNITTEST_START fail_unless(rc == CURLE_OK, "Curl_parse_login_details() failed"); - rc = Curl_disconnect(empty, empty->conn, FALSE); - fail_unless(rc == CURLE_OK, - "Curl_disconnect() with dead_connection set FALSE failed"); - Curl_freeset(empty); for(i = (enum dupstring)0; i < STRING_LAST; i++) { fail_unless(empty->set.str[i] == NULL, |