diff options
| -rw-r--r-- | docs/examples/shared-connection-cache.c | 85 | ||||
| -rw-r--r-- | tests/data/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/data/test1554 | 77 | ||||
| -rw-r--r-- | tests/libtest/Makefile.inc | 5 | ||||
| -rw-r--r-- | tests/libtest/lib1554.c (renamed from debug/shared-conn.c) | 39 |
5 files changed, 193 insertions, 15 deletions
diff --git a/docs/examples/shared-connection-cache.c b/docs/examples/shared-connection-cache.c new file mode 100644 index 000000000..a1aa0d674 --- /dev/null +++ b/docs/examples/shared-connection-cache.c @@ -0,0 +1,85 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * 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 + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +/* <DESC> + * Connection cache shared between easy handles with the share inteface + * </DESC> + */ +#include <stdio.h> +#include <curl/curl.h> + +static void my_lock(CURL *handle, curl_lock_data data, + curl_lock_access laccess, void *useptr) +{ + (void)handle; + (void)data; + (void)laccess; + (void)useptr; + fprintf(stderr, "-> Mutex lock\n"); +} + +static void my_unlock(CURL *handle, curl_lock_data data, void *useptr) +{ + (void)handle; + (void)data; + (void)useptr; + fprintf(stderr, "<- Mutex unlock\n"); +} + +int main(void) +{ + CURL *curl; + CURLcode res; + CURLSH *share; + int i; + + share = curl_share_init(); + curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_CONNECT); + + curl_share_setopt(share, CURLSHOPT_LOCKFUNC, my_lock); + curl_share_setopt(share, CURLSHOPT_UNLOCKFUNC, my_unlock); + + /* Loop the transfer and cleanup the handle properly every lap. This will + still reuse connections since the pool is in the shared object! */ + + for(i = 0; i < 3; i++) { + curl = curl_easy_init(); + if(curl) { + curl_easy_setopt(curl, CURLOPT_URL, "https://curl.haxx.se/"); + + /* use the share object */ + curl_easy_setopt(curl, CURLOPT_SHARE, share); + + /* Perform the request, res will get the return code */ + res = curl_easy_perform(curl); + /* Check for errors */ + if(res != CURLE_OK) + fprintf(stderr, "curl_easy_perform() failed: %s\n", + curl_easy_strerror(res)); + + /* always cleanup */ + curl_easy_cleanup(curl); + } + } + + curl_share_cleanup(share); + return 0; +} diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 6d253afa0..08d911773 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -170,7 +170,7 @@ test1520 test1521 \ test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \ test1533 test1534 test1535 test1536 test1537 test1538 \ test1540 \ -test1550 test1551 test1552 test1553 \ +test1550 test1551 test1552 test1553 test1554 \ test1600 test1601 test1602 test1603 test1604 test1605 test1606 \ \ test1700 test1701 test1702 \ diff --git a/tests/data/test1554 b/tests/data/test1554 new file mode 100644 index 000000000..8739b2c8a --- /dev/null +++ b/tests/data/test1554 @@ -0,0 +1,77 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +shared connections +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Type: text/html +Content-Length: 29 + +run 1: foobar and so on fun! +</data> +<datacheck> +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- 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 +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock +run 1: foobar and so on fun! +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock +run 1: foobar and so on fun! +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock +</datacheck> +</reply> + +# Client-side +<client> +<server> +http +</server> +<name> +HTTP with shared connection cache +</name> +<tool> +lib1554 +</tool> +<command> +http://%HOSTIP:%HTTPPORT/1554 +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +</verify> +</testcase> diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 26e6e06c8..9e1ba28a9 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -27,7 +27,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 lib1532 lib1533 \ lib1534 lib1535 lib1536 lib1537 lib1538 \ lib1540 \ - lib1550 lib1551 lib1552 lib1553 \ + lib1550 lib1551 lib1552 lib1553 lib1554 \ lib1900 \ lib2033 @@ -471,6 +471,9 @@ lib1553_SOURCES = lib1553.c $(SUPPORTFILES) $(TESTUTIL) lib1553_LDADD = $(TESTUTIL_LIBS) lib1553_CPPFLAGS = $(AM_CPPFLAGS) +lib1554_SOURCES = lib1554.c $(SUPPORTFILES) +lib1554_CPPFLAGS = $(AM_CPPFLAGS) + lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/debug/shared-conn.c b/tests/libtest/lib1554.c index f259a8c01..aa4aeb732 100644 --- a/debug/shared-conn.c +++ b/tests/libtest/lib1554.c @@ -19,14 +19,29 @@ * KIND, either express or implied. * ***************************************************************************/ -/* <DESC> - * Two HTTP GET using connection sharing with the share inteface - * </DESC> - */ -#include <stdio.h> -#include <curl/curl.h> +#include "test.h" +#include "memdebug.h" -int main(void) +static void my_lock(CURL *handle, curl_lock_data data, + curl_lock_access laccess, void *useptr) +{ + (void)handle; + (void)data; + (void)laccess; + (void)useptr; + printf("-> Mutex lock\n"); +} + +static void my_unlock(CURL *handle, curl_lock_data data, void *useptr) +{ + (void)handle; + (void)data; + (void)useptr; + printf("<- Mutex unlock\n"); +} + +/* test function */ +int test(char *URL) { CURL *curl; CURLcode res; @@ -35,6 +50,8 @@ int main(void) share = curl_share_init(); curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_CONNECT); + curl_share_setopt(share, CURLSHOPT_LOCKFUNC, my_lock); + curl_share_setopt(share, CURLSHOPT_UNLOCKFUNC, my_unlock); /* Loop the transfer and cleanup the handle properly every lap. This will still reuse connections since the pool is in the shared object! */ @@ -42,15 +59,11 @@ int main(void) for(i = 0; i < 3; i++) { curl = curl_easy_init(); if(curl) { - curl_easy_setopt(curl, CURLOPT_URL, "http://example.com"); - /* example.com is redirected, so we tell libcurl to follow redirection */ - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt(curl, CURLOPT_URL, URL); - /* use the connection pool in the share object */ + /* use the share object */ curl_easy_setopt(curl, CURLOPT_SHARE, share); - curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); - /* Perform the request, res will get the return code */ res = curl_easy_perform(curl); /* Check for errors */ |