[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 66/116: test1554: verify connection cache sharing
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 66/116: test1554: verify connection cache sharing |
Date: |
Tue, 05 Dec 2017 14:51:36 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit edd1f45c9f5f3046d4a18a33f65bbf63721bf178
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Nov 4 17:23:32 2017 +0100
test1554: verify connection cache sharing
---
.../examples/shared-connection-cache.c | 31 +++++++--
tests/data/Makefile.inc | 2 +-
tests/data/test1554 | 77 ++++++++++++++++++++++
tests/libtest/Makefile.inc | 5 +-
debug/shared-conn.c => tests/libtest/lib1554.c | 39 +++++++----
5 files changed, 132 insertions(+), 22 deletions(-)
diff --git a/debug/shared-conn.c b/docs/examples/shared-connection-cache.c
similarity index 74%
copy from debug/shared-conn.c
copy to docs/examples/shared-connection-cache.c
index f259a8c01..a1aa0d674 100644
--- a/debug/shared-conn.c
+++ b/docs/examples/shared-connection-cache.c
@@ -20,12 +20,30 @@
*
***************************************************************************/
/* <DESC>
- * Two HTTP GET using connection sharing with the share inteface
+ * 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;
@@ -36,21 +54,20 @@ 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! */
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, "https://curl.haxx.se/");
- /* 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 */
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
similarity index 74%
rename from debug/shared-conn.c
rename to 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 */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 48/116: curl: speed up handling of many URLs, (continued)
- [GNUnet-SVN] [gnurl] 48/116: curl: speed up handling of many URLs, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 43/116: tests: Fixed torture tests on tests 556 and 650, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 75/116: README.md: fixed layout, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 77/116: SMB: fix uninitialized local variable, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 27/116: RELEASE-NOTES: synced with f20cbac97, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 68/116: curl_share_setopt.3: document CURL_LOCK_DATA_CONNECT, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 52/116: HTTP: support multiple Content-Encodings, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 69/116: --interface: add support for Linux VRF, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 106/116: ssh: remove check for a NULL pointer (!), gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 92/116: http2: fix "Value stored to 'hdbuf' is never read" scan-build error, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 66/116: test1554: verify connection cache sharing,
gnunet <=
- [GNUnet-SVN] [gnurl] 67/116: examples: add shared-connection-cache, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 101/116: connect: add support for new TCP Fast Open API on Linux, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 58/116: url: remove unncessary NULL-check, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 79/116: INTERNALS: we may use libidn2 now, not libidn, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 96/116: test1264: verify URL with space in host name being rejected, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 26/116: auth: Added test cases for RFC7616, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 95/116: url: reject ASCII control characters and space in host names, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 78/116: zlib/brotli: only include header files in modules needing them, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 103/116: URL: update "file:" URL handling, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 83/116: openssl: fix too broad use of HAVE_OPAQUE_EVP_PKEY, gnunet, 2017/12/05