mirror of
https://github.com/curl/curl.git
synced 2024-11-21 01:16:58 +08:00
1be704e17e
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
72 lines
2.2 KiB
C
72 lines
2.2 KiB
C
#ifndef HEADER_CURL_SHARE_H
|
|
#define HEADER_CURL_SHARE_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 "cookie.h"
|
|
#include "psl.h"
|
|
#include "urldata.h"
|
|
#include "conncache.h"
|
|
|
|
#define CURL_GOOD_SHARE 0x7e117a1e
|
|
#define GOOD_SHARE_HANDLE(x) ((x) && (x)->magic == CURL_GOOD_SHARE)
|
|
|
|
#define CURL_SHARE_KEEP_CONNECT(s) \
|
|
((s) && ((s)->specifier & (1<< CURL_LOCK_DATA_CONNECT)))
|
|
|
|
/* this struct is libcurl-private, do not export details */
|
|
struct Curl_share {
|
|
unsigned int magic; /* CURL_GOOD_SHARE */
|
|
unsigned int specifier;
|
|
volatile unsigned int dirty;
|
|
|
|
curl_lock_function lockfunc;
|
|
curl_unlock_function unlockfunc;
|
|
void *clientdata;
|
|
struct cpool cpool;
|
|
struct Curl_hash hostcache;
|
|
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
|
|
struct CookieInfo *cookies;
|
|
#endif
|
|
#ifdef USE_LIBPSL
|
|
struct PslCache psl;
|
|
#endif
|
|
#ifndef CURL_DISABLE_HSTS
|
|
struct hsts *hsts;
|
|
#endif
|
|
#ifdef USE_SSL
|
|
struct Curl_ssl_session *sslsession;
|
|
size_t max_ssl_sessions;
|
|
long sessionage;
|
|
#endif
|
|
};
|
|
|
|
CURLSHcode Curl_share_lock(struct Curl_easy *, curl_lock_data,
|
|
curl_lock_access);
|
|
CURLSHcode Curl_share_unlock(struct Curl_easy *, curl_lock_data);
|
|
|
|
#endif /* HEADER_CURL_SHARE_H */
|