Further testing with timeouts in event based processing
revealed that our current shutdown handling in the connection
pool was not clear enough. Graceful shutdowns can only happen
inside a multi handle and it was confusing to track in the code
which situation actually applies. It seems better to split
the shutdown handling off and have that code always be part
of a multi handle.
Add `cshutdn.[ch]` with its own struct to maintain connections
being shut down. A `cshutdn` always belongs to a multi handle
and uses that for socket/timeout monitoring.
The `cpool`, which can be part of a multi or share, either
passes connections to a `cshutdn` or terminates them with a
one-time, best effort.
Add an `admin` easy handle to each multi and share. This is
used to perform all maintenance operations where no "real"
easy handle is available. This solves the problem
that the multi admin handle requires some additional
initialisation (e.g. timeout list).
The share needs its admin handle as it is often cleaned up
when no other transfer or multi handle exists any more. But
we need a `data` in almost every call.
Fix file:// handling of errors when adding a new connection
to the pool.
Changes in `curl` itself:
- for parallel transfers, do not set a connection pool in the share,
rely on the multi's connection pool instead.
While not a requirement for the new `cshutdn` to work, this is
a) helpful in testing to trigger graceful shutdowns
b) a broader code coverage of libcurl via the curl tool
- on test_event with uv, cleanup the multi handle before returning
from parallel_event(). The uv struct is on the stack, cleanup
of the multi later will crash when it tries to register sockets.
This is a "eat your own dogfoof" related fix.
314 lines
7.6 KiB
C
314 lines
7.6 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 "urldata.h"
|
|
#include "connect.h"
|
|
#include "share.h"
|
|
#include "psl.h"
|
|
#include "vtls/vtls.h"
|
|
#include "vtls/vtls_scache.h"
|
|
#include "hsts.h"
|
|
#include "url.h"
|
|
|
|
/* The last 3 #include files should be in this order */
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
CURLSH *
|
|
curl_share_init(void)
|
|
{
|
|
struct Curl_share *share = calloc(1, sizeof(struct Curl_share));
|
|
if(share) {
|
|
share->magic = CURL_GOOD_SHARE;
|
|
share->specifier |= (1 << CURL_LOCK_DATA_SHARE);
|
|
Curl_init_dnscache(&share->hostcache, 23);
|
|
share->admin = curl_easy_init();
|
|
if(!share->admin) {
|
|
free(share);
|
|
return NULL;
|
|
}
|
|
share->admin->state.internal = TRUE;
|
|
#ifdef DEBUGBUILD
|
|
if(getenv("CURL_DEBUG"))
|
|
share->admin->set.verbose = TRUE;
|
|
#endif
|
|
}
|
|
|
|
return share;
|
|
}
|
|
|
|
#undef curl_share_setopt
|
|
CURLSHcode
|
|
curl_share_setopt(CURLSH *sh, CURLSHoption option, ...)
|
|
{
|
|
va_list param;
|
|
int type;
|
|
curl_lock_function lockfunc;
|
|
curl_unlock_function unlockfunc;
|
|
void *ptr;
|
|
CURLSHcode res = CURLSHE_OK;
|
|
struct Curl_share *share = sh;
|
|
|
|
if(!GOOD_SHARE_HANDLE(share))
|
|
return CURLSHE_INVALID;
|
|
|
|
if(share->dirty)
|
|
/* do not allow setting options while one or more handles are already
|
|
using this share */
|
|
return CURLSHE_IN_USE;
|
|
|
|
va_start(param, option);
|
|
|
|
switch(option) {
|
|
case CURLSHOPT_SHARE:
|
|
/* this is a type this share will share */
|
|
type = va_arg(param, int);
|
|
|
|
switch(type) {
|
|
case CURL_LOCK_DATA_DNS:
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_COOKIE:
|
|
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
|
|
if(!share->cookies) {
|
|
share->cookies = Curl_cookie_init(NULL, NULL, NULL, TRUE);
|
|
if(!share->cookies)
|
|
res = CURLSHE_NOMEM;
|
|
}
|
|
#else /* CURL_DISABLE_HTTP */
|
|
res = CURLSHE_NOT_BUILT_IN;
|
|
#endif
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_HSTS:
|
|
#ifndef CURL_DISABLE_HSTS
|
|
if(!share->hsts) {
|
|
share->hsts = Curl_hsts_init();
|
|
if(!share->hsts)
|
|
res = CURLSHE_NOMEM;
|
|
}
|
|
#else /* CURL_DISABLE_HSTS */
|
|
res = CURLSHE_NOT_BUILT_IN;
|
|
#endif
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_SSL_SESSION:
|
|
#ifdef USE_SSL
|
|
if(!share->ssl_scache) {
|
|
/* There is no way (yet) for the application to configure the
|
|
* session cache size, shared between many transfers. As for curl
|
|
* itself, a high session count will impact startup time. Also, the
|
|
* scache is not optimized for several hundreds of peers. So,
|
|
* keep it at a reasonable level. */
|
|
if(Curl_ssl_scache_create(25, 2, &share->ssl_scache))
|
|
res = CURLSHE_NOMEM;
|
|
}
|
|
#else
|
|
res = CURLSHE_NOT_BUILT_IN;
|
|
#endif
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_CONNECT:
|
|
/* It is safe to set this option several times on a share. */
|
|
if(!share->cpool.initialised) {
|
|
if(Curl_cpool_init(&share->cpool, Curl_on_disconnect,
|
|
share->admin, share, 103))
|
|
res = CURLSHE_NOMEM;
|
|
}
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_PSL:
|
|
#ifndef USE_LIBPSL
|
|
res = CURLSHE_NOT_BUILT_IN;
|
|
#endif
|
|
break;
|
|
|
|
default:
|
|
res = CURLSHE_BAD_OPTION;
|
|
}
|
|
if(!res)
|
|
share->specifier |= (unsigned int)(1 << type);
|
|
break;
|
|
|
|
case CURLSHOPT_UNSHARE:
|
|
/* this is a type this share will no longer share */
|
|
type = va_arg(param, int);
|
|
share->specifier &= ~(unsigned int)(1 << type);
|
|
switch(type) {
|
|
case CURL_LOCK_DATA_DNS:
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_COOKIE:
|
|
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
|
|
if(share->cookies) {
|
|
Curl_cookie_cleanup(share->cookies);
|
|
share->cookies = NULL;
|
|
}
|
|
#else /* CURL_DISABLE_HTTP */
|
|
res = CURLSHE_NOT_BUILT_IN;
|
|
#endif
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_HSTS:
|
|
#ifndef CURL_DISABLE_HSTS
|
|
if(share->hsts) {
|
|
Curl_hsts_cleanup(&share->hsts);
|
|
}
|
|
#else /* CURL_DISABLE_HSTS */
|
|
res = CURLSHE_NOT_BUILT_IN;
|
|
#endif
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_SSL_SESSION:
|
|
#ifdef USE_SSL
|
|
if(share->ssl_scache) {
|
|
Curl_ssl_scache_destroy(share->ssl_scache);
|
|
share->ssl_scache = NULL;
|
|
}
|
|
#else
|
|
res = CURLSHE_NOT_BUILT_IN;
|
|
#endif
|
|
break;
|
|
|
|
case CURL_LOCK_DATA_CONNECT:
|
|
break;
|
|
|
|
default:
|
|
res = CURLSHE_BAD_OPTION;
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case CURLSHOPT_LOCKFUNC:
|
|
lockfunc = va_arg(param, curl_lock_function);
|
|
share->lockfunc = lockfunc;
|
|
break;
|
|
|
|
case CURLSHOPT_UNLOCKFUNC:
|
|
unlockfunc = va_arg(param, curl_unlock_function);
|
|
share->unlockfunc = unlockfunc;
|
|
break;
|
|
|
|
case CURLSHOPT_USERDATA:
|
|
ptr = va_arg(param, void *);
|
|
share->clientdata = ptr;
|
|
break;
|
|
|
|
default:
|
|
res = CURLSHE_BAD_OPTION;
|
|
break;
|
|
}
|
|
|
|
va_end(param);
|
|
|
|
return res;
|
|
}
|
|
|
|
CURLSHcode
|
|
curl_share_cleanup(CURLSH *sh)
|
|
{
|
|
struct Curl_share *share = sh;
|
|
if(!GOOD_SHARE_HANDLE(share))
|
|
return CURLSHE_INVALID;
|
|
|
|
if(share->lockfunc)
|
|
share->lockfunc(NULL, CURL_LOCK_DATA_SHARE, CURL_LOCK_ACCESS_SINGLE,
|
|
share->clientdata);
|
|
|
|
if(share->dirty) {
|
|
if(share->unlockfunc)
|
|
share->unlockfunc(NULL, CURL_LOCK_DATA_SHARE, share->clientdata);
|
|
return CURLSHE_IN_USE;
|
|
}
|
|
|
|
if(share->specifier & (1 << CURL_LOCK_DATA_CONNECT)) {
|
|
Curl_cpool_destroy(&share->cpool);
|
|
}
|
|
Curl_hash_destroy(&share->hostcache);
|
|
|
|
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
|
|
Curl_cookie_cleanup(share->cookies);
|
|
#endif
|
|
|
|
#ifndef CURL_DISABLE_HSTS
|
|
Curl_hsts_cleanup(&share->hsts);
|
|
#endif
|
|
|
|
#ifdef USE_SSL
|
|
if(share->ssl_scache) {
|
|
Curl_ssl_scache_destroy(share->ssl_scache);
|
|
share->ssl_scache = NULL;
|
|
}
|
|
#endif
|
|
|
|
Curl_psl_destroy(&share->psl);
|
|
Curl_close(&share->admin);
|
|
|
|
if(share->unlockfunc)
|
|
share->unlockfunc(NULL, CURL_LOCK_DATA_SHARE, share->clientdata);
|
|
share->magic = 0;
|
|
free(share);
|
|
|
|
return CURLSHE_OK;
|
|
}
|
|
|
|
|
|
CURLSHcode
|
|
Curl_share_lock(struct Curl_easy *data, curl_lock_data type,
|
|
curl_lock_access accesstype)
|
|
{
|
|
struct Curl_share *share = data->share;
|
|
|
|
if(!share)
|
|
return CURLSHE_INVALID;
|
|
|
|
if(share->specifier & (unsigned int)(1 << type)) {
|
|
if(share->lockfunc) /* only call this if set! */
|
|
share->lockfunc(data, type, accesstype, share->clientdata);
|
|
}
|
|
/* else if we do not share this, pretend successful lock */
|
|
|
|
return CURLSHE_OK;
|
|
}
|
|
|
|
CURLSHcode
|
|
Curl_share_unlock(struct Curl_easy *data, curl_lock_data type)
|
|
{
|
|
struct Curl_share *share = data->share;
|
|
|
|
if(!share)
|
|
return CURLSHE_INVALID;
|
|
|
|
if(share->specifier & (unsigned int)(1 << type)) {
|
|
if(share->unlockfunc) /* only call this if set! */
|
|
share->unlockfunc (data, type, share->clientdata);
|
|
}
|
|
|
|
return CURLSHE_OK;
|
|
}
|