From d021f2e8a0067fc769652f27afec9024c0d02b3d Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Thu, 6 Dec 2012 12:12:04 +0100 Subject: Introducing a new persistent connection caching system using "bundles". A bundle is a list of all persistent connections to the same host. The connection cache consists of a hash of bundles, with the hostname as the key. The benefits may not be obvious, but they are two: 1) Faster search for connections to reuse, since the hash lookup only finds connections to the host in question. 2) It lays out the groundworks for an upcoming patch, which will introduce multiple HTTP pipelines. This patch also removes the awkward list of "closure handles", which were needed to send QUIT commands to the FTP server when closing a connection. Now we allocate a separate closure handle and use that one to close all connections. This has been tested in a live system for a few weeks, and of course passes the test suite. --- lib/conncache.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 lib/conncache.h (limited to 'lib/conncache.h') diff --git a/lib/conncache.h b/lib/conncache.h new file mode 100644 index 000000000..a6e1af70c --- /dev/null +++ b/lib/conncache.h @@ -0,0 +1,56 @@ +#ifndef __CONNCACHE_H +#define __CONNCACHE_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 2012, Linus Nielsen Feltzing, + * + * 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 http://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. + * + ***************************************************************************/ + +struct conncache { + struct curl_hash *hash; + enum { + CONNCACHE_PRIVATE, /* used for an easy handle alone */ + CONNCACHE_MULTI /* shared within a multi handle */ + } type; + size_t num_connections; +}; + +struct conncache *Curl_conncache_init(int type); + +void Curl_conncache_destroy(struct conncache *connc); + +struct connectbundle *Curl_conncache_find_bundle(struct conncache *connc, + char *hostname); + +CURLcode Curl_conncache_add_conn(struct conncache *connc, + struct connectdata *conn); + +void Curl_conncache_remove_conn(struct conncache *connc, + struct connectdata *conn); + +void Curl_conncache_foreach(struct conncache *connc, + void *param, + void (*func)(void *, void *)); + +struct connectdata * +Curl_conncache_find_first_connection(struct conncache *connc); + +void Curl_conncache_print(struct conncache *connc); + +#endif /* __CONNCACHE_H */ -- cgit v1.2.1 From 4710d3d96977bb60db181083c8a1f39d836b3899 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 10 Dec 2012 17:04:13 +0100 Subject: conncache: fix enumerated type mixed with another type --- lib/conncache.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'lib/conncache.h') diff --git a/lib/conncache.h b/lib/conncache.h index a6e1af70c..7b7baae2c 100644 --- a/lib/conncache.h +++ b/lib/conncache.h @@ -1,5 +1,5 @@ -#ifndef __CONNCACHE_H -#define __CONNCACHE_H +#ifndef HEADER_CURL_CONNCACHE_H +#define HEADER_CURL_CONNCACHE_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -22,16 +22,18 @@ * ***************************************************************************/ +typedef enum { + CONNCACHE_PRIVATE, /* used for an easy handle alone */ + CONNCACHE_MULTI /* shared within a multi handle */ +} conncachetype; + struct conncache { struct curl_hash *hash; - enum { - CONNCACHE_PRIVATE, /* used for an easy handle alone */ - CONNCACHE_MULTI /* shared within a multi handle */ - } type; + conncachetype type; size_t num_connections; }; -struct conncache *Curl_conncache_init(int type); +struct conncache *Curl_conncache_init(conncachetype type); void Curl_conncache_destroy(struct conncache *connc); @@ -53,4 +55,4 @@ Curl_conncache_find_first_connection(struct conncache *connc); void Curl_conncache_print(struct conncache *connc); -#endif /* __CONNCACHE_H */ +#endif /* HEADER_CURL_CONNCACHE_H */ -- cgit v1.2.1 From 6fc16fe4047c72eeb280f935d88e789397381ab2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 11 Dec 2012 20:13:29 +0100 Subject: Curl_conncache_foreach: allow callback to break loop ... and have it take a proper 'struct connectdata *' as first argument --- lib/conncache.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/conncache.h') diff --git a/lib/conncache.h b/lib/conncache.h index 7b7baae2c..03b129d4e 100644 --- a/lib/conncache.h +++ b/lib/conncache.h @@ -48,7 +48,8 @@ void Curl_conncache_remove_conn(struct conncache *connc, void Curl_conncache_foreach(struct conncache *connc, void *param, - void (*func)(void *, void *)); + int (*func)(struct connectdata *conn, + void *param)); struct connectdata * Curl_conncache_find_first_connection(struct conncache *connc); -- cgit v1.2.1