This is a better match for what they do and the general "cpool" var/function prefix works well. The pool now handles very long hostnames correctly. The following changes have been made: * 'struct connectdata', e.g. connections, keep new members named `destination` and ' destination_len' that fully specifies interface+port+hostname of where the connection is going to. This is used in the pool for "bundling" of connections with the same destination. There is no limit on the length any more. * Locking: all locks are done inside conncache.c when calling into the pool and released on return. This eliminates hazards of the callers keeping track. * 'struct connectbundle' is now internal to the pool. It is no longer referenced by a connection. * 'bundle->multiuse' no longer exists. HTTP/2 and 3 and TLS filters no longer need to set it. Instead, the multi checks on leaving MSTATE_CONNECT or MSTATE_CONNECTING if the connection is now multiplexed and new, e.g. not conn->bits.reuse. In that case the processing of pending handles is triggered. * The pool's init is provided with a callback to invoke on all connections being discarded. This allows the cleanups in `Curl_disconnect` to run, wherever it is decided to retire a connection. * Several pool operations can now be fully done with one call. Pruning dead connections, upkeep and checks on pool limits can now directly discard connections and need no longer return those to the caller for doing that (as we have now the callback described above). * Finding a connection for reuse is now done via `Curl_cpool_find()` and the caller provides callbacks to evaluate the connection candidates. * The 'Curl_cpool_check_limits()' now directly uses the max values that may be set in the transfer's multi. No need to pass them around. Curl_multi_max_host_connections() and Curl_multi_max_total_connections() are gone. * Add method 'Curl_node_llist()' to get the llist a node is in. Used in cpool to verify connection are indeed in the list (or not in any list) as they need to. I left the conncache.[ch] as is for now and also did not touch the documentation. If we update that outside the feature window, we can do this in a separate PR. Multi-thread safety is not achieved by this PR, but since more details on how pools operate are now "internal" it is a better starting point to go for this in the future. Closes #14662
264 lines
6.1 KiB
C
264 lines
6.1 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 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.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.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "llist.h"
|
|
#include "curl_memory.h"
|
|
|
|
/* this must be the last include file */
|
|
#include "memdebug.h"
|
|
|
|
#define LLISTINIT 0x100cc001 /* random pattern */
|
|
#define NODEINIT 0x12344321 /* random pattern */
|
|
#define NODEREM 0x54321012 /* random pattern */
|
|
|
|
|
|
#ifdef DEBUGBUILD
|
|
#define VERIFYNODE(x) verifynode(x)
|
|
static struct Curl_llist_node *verifynode(struct Curl_llist_node *n)
|
|
{
|
|
DEBUGASSERT(!n || (n->_init == NODEINIT));
|
|
return n;
|
|
}
|
|
#else
|
|
#define VERIFYNODE(x) x
|
|
#endif
|
|
/*
|
|
* @unittest: 1300
|
|
*/
|
|
void
|
|
Curl_llist_init(struct Curl_llist *l, Curl_llist_dtor dtor)
|
|
{
|
|
l->_size = 0;
|
|
l->_dtor = dtor;
|
|
l->_head = NULL;
|
|
l->_tail = NULL;
|
|
#ifdef DEBUGBUILD
|
|
l->_init = LLISTINIT;
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* Curl_llist_insert_next()
|
|
*
|
|
* Inserts a new list element after the given one 'e'. If the given existing
|
|
* entry is NULL and the list already has elements, the new one will be
|
|
* inserted first in the list.
|
|
*
|
|
* The 'ne' argument should be a pointer into the object to store.
|
|
*
|
|
* @unittest: 1300
|
|
*/
|
|
void
|
|
Curl_llist_insert_next(struct Curl_llist *list,
|
|
struct Curl_llist_node *e, /* may be NULL */
|
|
const void *p,
|
|
struct Curl_llist_node *ne)
|
|
{
|
|
DEBUGASSERT(list);
|
|
DEBUGASSERT(list->_init == LLISTINIT);
|
|
DEBUGASSERT(ne);
|
|
|
|
#ifdef DEBUGBUILD
|
|
ne->_init = NODEINIT;
|
|
#endif
|
|
ne->_ptr = (void *) p;
|
|
ne->_list = list;
|
|
if(list->_size == 0) {
|
|
list->_head = ne;
|
|
list->_head->_prev = NULL;
|
|
list->_head->_next = NULL;
|
|
list->_tail = ne;
|
|
}
|
|
else {
|
|
/* if 'e' is NULL here, we insert the new element first in the list */
|
|
ne->_next = e?e->_next:list->_head;
|
|
ne->_prev = e;
|
|
if(!e) {
|
|
list->_head->_prev = ne;
|
|
list->_head = ne;
|
|
}
|
|
else if(e->_next) {
|
|
e->_next->_prev = ne;
|
|
}
|
|
else {
|
|
list->_tail = ne;
|
|
}
|
|
if(e)
|
|
e->_next = ne;
|
|
}
|
|
|
|
++list->_size;
|
|
}
|
|
|
|
/*
|
|
* Curl_llist_append()
|
|
*
|
|
* Adds a new list element to the end of the list.
|
|
*
|
|
* The 'ne' argument should be a pointer into the object to store.
|
|
*
|
|
* @unittest: 1300
|
|
*/
|
|
void
|
|
Curl_llist_append(struct Curl_llist *list, const void *p,
|
|
struct Curl_llist_node *ne)
|
|
{
|
|
DEBUGASSERT(list);
|
|
DEBUGASSERT(list->_init == LLISTINIT);
|
|
DEBUGASSERT(ne);
|
|
Curl_llist_insert_next(list, list->_tail, p, ne);
|
|
}
|
|
|
|
/*
|
|
* @unittest: 1300
|
|
*/
|
|
void
|
|
Curl_node_uremove(struct Curl_llist_node *e, void *user)
|
|
{
|
|
void *ptr;
|
|
struct Curl_llist *list;
|
|
if(!e)
|
|
return;
|
|
|
|
list = e->_list;
|
|
DEBUGASSERT(list);
|
|
DEBUGASSERT(list->_init == LLISTINIT);
|
|
DEBUGASSERT(list->_size);
|
|
DEBUGASSERT(e->_init == NODEINIT);
|
|
if(e == list->_head) {
|
|
list->_head = e->_next;
|
|
|
|
if(!list->_head)
|
|
list->_tail = NULL;
|
|
else
|
|
e->_next->_prev = NULL;
|
|
}
|
|
else {
|
|
if(e->_prev)
|
|
e->_prev->_next = e->_next;
|
|
|
|
if(!e->_next)
|
|
list->_tail = e->_prev;
|
|
else
|
|
e->_next->_prev = e->_prev;
|
|
}
|
|
|
|
ptr = e->_ptr;
|
|
|
|
e->_ptr = NULL;
|
|
e->_prev = NULL;
|
|
e->_next = NULL;
|
|
#ifdef DEBUGBUILD
|
|
e->_init = NODEREM; /* specific pattern on remove - not zero */
|
|
#endif
|
|
|
|
--list->_size;
|
|
|
|
/* call the dtor() last for when it actually frees the 'e' memory itself */
|
|
if(list->_dtor)
|
|
list->_dtor(user, ptr);
|
|
}
|
|
|
|
void Curl_node_remove(struct Curl_llist_node *e)
|
|
{
|
|
Curl_node_uremove(e, NULL);
|
|
}
|
|
|
|
void
|
|
Curl_llist_destroy(struct Curl_llist *list, void *user)
|
|
{
|
|
if(list) {
|
|
DEBUGASSERT(list->_init == LLISTINIT);
|
|
while(list->_size > 0)
|
|
Curl_node_uremove(list->_tail, user);
|
|
}
|
|
}
|
|
|
|
/* Curl_llist_head() returns the first 'struct Curl_llist_node *', which
|
|
might be NULL */
|
|
struct Curl_llist_node *Curl_llist_head(struct Curl_llist *list)
|
|
{
|
|
DEBUGASSERT(list);
|
|
DEBUGASSERT(list->_init == LLISTINIT);
|
|
return VERIFYNODE(list->_head);
|
|
}
|
|
|
|
/* Curl_llist_tail() returns the last 'struct Curl_llist_node *', which
|
|
might be NULL */
|
|
struct Curl_llist_node *Curl_llist_tail(struct Curl_llist *list)
|
|
{
|
|
DEBUGASSERT(list);
|
|
DEBUGASSERT(list->_init == LLISTINIT);
|
|
return VERIFYNODE(list->_tail);
|
|
}
|
|
|
|
/* Curl_llist_count() returns a size_t the number of nodes in the list */
|
|
size_t Curl_llist_count(struct Curl_llist *list)
|
|
{
|
|
DEBUGASSERT(list);
|
|
DEBUGASSERT(list->_init == LLISTINIT);
|
|
return list->_size;
|
|
}
|
|
|
|
/* Curl_node_elem() returns the custom data from a Curl_llist_node */
|
|
void *Curl_node_elem(struct Curl_llist_node *n)
|
|
{
|
|
DEBUGASSERT(n);
|
|
DEBUGASSERT(n->_init == NODEINIT);
|
|
return n->_ptr;
|
|
}
|
|
|
|
/* Curl_node_next() returns the next element in a list from a given
|
|
Curl_llist_node */
|
|
struct Curl_llist_node *Curl_node_next(struct Curl_llist_node *n)
|
|
{
|
|
DEBUGASSERT(n);
|
|
DEBUGASSERT(n->_init == NODEINIT);
|
|
return VERIFYNODE(n->_next);
|
|
}
|
|
|
|
#ifdef UNITTEST
|
|
|
|
/* Curl_node_prev() returns the previous element in a list from a given
|
|
Curl_llist_node */
|
|
struct Curl_llist_node *Curl_node_prev(struct Curl_llist_node *n)
|
|
{
|
|
DEBUGASSERT(n);
|
|
DEBUGASSERT(n->_init == NODEINIT);
|
|
return VERIFYNODE(n->_prev);
|
|
}
|
|
|
|
#endif
|
|
|
|
struct Curl_llist *Curl_node_llist(struct Curl_llist_node *n)
|
|
{
|
|
DEBUGASSERT(n);
|
|
DEBUGASSERT(!n->_list || n->_init == NODEINIT);
|
|
return n->_list;
|
|
}
|