conncache: make hashkey avoid malloc
... to make it much faster. Idea developed with primepie on IRC. Closes #1365
This commit is contained in:
Родитель
2549831daa
Коммит
2066072ff2
|
@ -5,8 +5,8 @@
|
||||||
* | (__| |_| | _ <| |___
|
* | (__| |_| | _ <| |___
|
||||||
* \___|\___/|_| \_\_____|
|
* \___|\___/|_| \_\_____|
|
||||||
*
|
*
|
||||||
* Copyright (C) 2012, 2016, Linus Nielsen Feltzing, <linus@haxx.se>
|
* Copyright (C) 2012 - 2016, Linus Nielsen Feltzing, <linus@haxx.se>
|
||||||
* Copyright (C) 2012 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
|
* Copyright (C) 2012 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||||
*
|
*
|
||||||
* This software is licensed as described in the file COPYING, which
|
* This software is licensed as described in the file COPYING, which
|
||||||
* you should have received as part of this distribution. The terms
|
* you should have received as part of this distribution. The terms
|
||||||
|
@ -127,8 +127,9 @@ void Curl_conncache_destroy(struct conncache *connc)
|
||||||
Curl_hash_destroy(&connc->hash);
|
Curl_hash_destroy(&connc->hash);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* returns an allocated key to find a bundle for this connection */
|
/* creates a key to find a bundle for this connection */
|
||||||
static char *hashkey(struct connectdata *conn)
|
static void hashkey(struct connectdata *conn, char *buf,
|
||||||
|
size_t len) /* something like 128 is fine */
|
||||||
{
|
{
|
||||||
const char *hostname;
|
const char *hostname;
|
||||||
|
|
||||||
|
@ -141,7 +142,10 @@ static char *hashkey(struct connectdata *conn)
|
||||||
else
|
else
|
||||||
hostname = conn->host.name;
|
hostname = conn->host.name;
|
||||||
|
|
||||||
return aprintf("%s:%ld", hostname, conn->port);
|
DEBUGASSERT(len > 32);
|
||||||
|
|
||||||
|
/* put the number first so that the hostname gets cut off if too long */
|
||||||
|
snprintf(buf, len, "%ld%s", conn->port, hostname);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Look up the bundle with all the connections to the same host this
|
/* Look up the bundle with all the connections to the same host this
|
||||||
|
@ -151,11 +155,9 @@ struct connectbundle *Curl_conncache_find_bundle(struct connectdata *conn,
|
||||||
{
|
{
|
||||||
struct connectbundle *bundle = NULL;
|
struct connectbundle *bundle = NULL;
|
||||||
if(connc) {
|
if(connc) {
|
||||||
char *key = hashkey(conn);
|
char key[128];
|
||||||
if(key) {
|
hashkey(conn, key, sizeof(key));
|
||||||
bundle = Curl_hash_pick(&connc->hash, key, strlen(key));
|
bundle = Curl_hash_pick(&connc->hash, key, strlen(key));
|
||||||
free(key);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return bundle;
|
return bundle;
|
||||||
|
@ -204,21 +206,16 @@ CURLcode Curl_conncache_add_conn(struct conncache *connc,
|
||||||
|
|
||||||
bundle = Curl_conncache_find_bundle(conn, data->state.conn_cache);
|
bundle = Curl_conncache_find_bundle(conn, data->state.conn_cache);
|
||||||
if(!bundle) {
|
if(!bundle) {
|
||||||
char *key;
|
|
||||||
int rc;
|
int rc;
|
||||||
|
char key[128];
|
||||||
|
|
||||||
result = bundle_create(data, &new_bundle);
|
result = bundle_create(data, &new_bundle);
|
||||||
if(result)
|
if(result)
|
||||||
return result;
|
return result;
|
||||||
|
|
||||||
key = hashkey(conn);
|
hashkey(conn, key, sizeof(key));
|
||||||
if(!key) {
|
|
||||||
bundle_destroy(new_bundle);
|
|
||||||
return CURLE_OUT_OF_MEMORY;
|
|
||||||
}
|
|
||||||
|
|
||||||
rc = conncache_add_bundle(data->state.conn_cache, key, new_bundle);
|
rc = conncache_add_bundle(data->state.conn_cache, key, new_bundle);
|
||||||
free(key);
|
|
||||||
if(!rc) {
|
if(!rc) {
|
||||||
bundle_destroy(new_bundle);
|
bundle_destroy(new_bundle);
|
||||||
return CURLE_OUT_OF_MEMORY;
|
return CURLE_OUT_OF_MEMORY;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче