mirror of
https://github.com/curl/curl.git
synced 2026-04-19 09:41:13 +03:00
Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up tob12da22db1#18866 Follow-up todb98daab05#18844 Follow-up to4deea9396b#18814 Follow-up to9678ff5b1b#18776 Follow-up to10bac43b87#18774 Follow-up to20142f5d06#18634 Follow-up tobf7375ecc5#18503 Follow-up to9863599d69#18502 Follow-up to3bb5e58c10#17827 Closes #19626
243 lines
6.3 KiB
C
243 lines
6.3 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 "first.h"
|
|
|
|
#define THREADS 2
|
|
|
|
/* struct containing data of a thread */
|
|
struct t586_Tdata {
|
|
CURLSH *share;
|
|
const char *url;
|
|
};
|
|
|
|
struct t586_userdata {
|
|
const char *text;
|
|
int counter;
|
|
};
|
|
|
|
/* lock callback */
|
|
static void t586_test_lock(CURL *curl, curl_lock_data data,
|
|
curl_lock_access laccess, void *useptr)
|
|
{
|
|
const char *what;
|
|
struct t586_userdata *user = (struct t586_userdata *)useptr;
|
|
|
|
(void)curl;
|
|
(void)laccess;
|
|
|
|
switch(data) {
|
|
case CURL_LOCK_DATA_SHARE:
|
|
what = "share";
|
|
break;
|
|
case CURL_LOCK_DATA_DNS:
|
|
what = "dns";
|
|
break;
|
|
case CURL_LOCK_DATA_COOKIE:
|
|
what = "cookie";
|
|
break;
|
|
case CURL_LOCK_DATA_SSL_SESSION:
|
|
what = "ssl_session";
|
|
break;
|
|
default:
|
|
curl_mfprintf(stderr, "lock: no such data: %d\n", data);
|
|
return;
|
|
}
|
|
curl_mprintf("lock: %-6s [%s]: %d\n", what, user->text, user->counter);
|
|
user->counter++;
|
|
}
|
|
|
|
/* unlock callback */
|
|
static void t586_test_unlock(CURL *curl, curl_lock_data data, void *useptr)
|
|
{
|
|
const char *what;
|
|
struct t586_userdata *user = (struct t586_userdata *)useptr;
|
|
(void)curl;
|
|
switch(data) {
|
|
case CURL_LOCK_DATA_SHARE:
|
|
what = "share";
|
|
break;
|
|
case CURL_LOCK_DATA_DNS:
|
|
what = "dns";
|
|
break;
|
|
case CURL_LOCK_DATA_COOKIE:
|
|
what = "cookie";
|
|
break;
|
|
case CURL_LOCK_DATA_SSL_SESSION:
|
|
what = "ssl_session";
|
|
break;
|
|
default:
|
|
curl_mfprintf(stderr, "unlock: no such data: %d\n", data);
|
|
return;
|
|
}
|
|
curl_mprintf("unlock: %-6s [%s]: %d\n", what, user->text, user->counter);
|
|
user->counter++;
|
|
}
|
|
|
|
/* the dummy thread function */
|
|
static void *t586_test_fire(void *ptr)
|
|
{
|
|
CURLcode code;
|
|
struct t586_Tdata *tdata = (struct t586_Tdata*)ptr;
|
|
CURL *curl;
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
|
return NULL;
|
|
}
|
|
|
|
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
|
|
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
curl_easy_setopt(curl, CURLOPT_URL, tdata->url);
|
|
curl_mprintf("CURLOPT_SHARE\n");
|
|
curl_easy_setopt(curl, CURLOPT_SHARE, tdata->share);
|
|
|
|
curl_mprintf("PERFORM\n");
|
|
code = curl_easy_perform(curl);
|
|
if(code != CURLE_OK) {
|
|
int i = 0;
|
|
curl_mfprintf(stderr, "perform URL '%s' repeat %d failed, curlcode %d\n",
|
|
tdata->url, i, code);
|
|
}
|
|
|
|
curl_mprintf("CLEANUP\n");
|
|
curl_easy_cleanup(curl);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* test function */
|
|
static CURLcode test_lib586(const char *URL)
|
|
{
|
|
CURLcode res = CURLE_OK;
|
|
CURLSHcode scode = CURLSHE_OK;
|
|
struct t586_Tdata tdata;
|
|
CURL *curl;
|
|
CURLSH *share;
|
|
int i;
|
|
struct t586_userdata user;
|
|
|
|
user.text = "Pigs in space";
|
|
user.counter = 0;
|
|
|
|
curl_mprintf("GLOBAL_INIT\n");
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
curl_mfprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
/* prepare share */
|
|
curl_mprintf("SHARE_INIT\n");
|
|
share = curl_share_init();
|
|
if(!share) {
|
|
curl_mfprintf(stderr, "curl_share_init() failed\n");
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
if(CURLSHE_OK == scode) {
|
|
curl_mprintf("CURLSHOPT_LOCKFUNC\n");
|
|
scode = curl_share_setopt(share, CURLSHOPT_LOCKFUNC, t586_test_lock);
|
|
}
|
|
if(CURLSHE_OK == scode) {
|
|
curl_mprintf("CURLSHOPT_UNLOCKFUNC\n");
|
|
scode = curl_share_setopt(share, CURLSHOPT_UNLOCKFUNC, t586_test_unlock);
|
|
}
|
|
if(CURLSHE_OK == scode) {
|
|
curl_mprintf("CURLSHOPT_USERDATA\n");
|
|
scode = curl_share_setopt(share, CURLSHOPT_USERDATA, &user);
|
|
}
|
|
if(CURLSHE_OK == scode) {
|
|
curl_mprintf("CURL_LOCK_DATA_SSL_SESSION\n");
|
|
scode = curl_share_setopt(share, CURLSHOPT_SHARE,
|
|
CURL_LOCK_DATA_SSL_SESSION);
|
|
}
|
|
|
|
if(CURLSHE_OK != scode) {
|
|
curl_mfprintf(stderr, "curl_share_setopt() failed\n");
|
|
curl_share_cleanup(share);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
|
|
/* start treads */
|
|
for(i = 1; i <= THREADS; i++) {
|
|
|
|
/* set thread data */
|
|
tdata.url = URL;
|
|
tdata.share = share;
|
|
|
|
/* simulate thread, direct call of "thread" function */
|
|
curl_mprintf("*** run %d\n",i);
|
|
t586_test_fire(&tdata);
|
|
}
|
|
|
|
|
|
/* fetch another one */
|
|
curl_mprintf("*** run %d\n", i);
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
curl_mfprintf(stderr, "curl_easy_init() failed\n");
|
|
curl_share_cleanup(share);
|
|
curl_global_cleanup();
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
test_setopt(curl, CURLOPT_URL, URL);
|
|
curl_mprintf("CURLOPT_SHARE\n");
|
|
test_setopt(curl, CURLOPT_SHARE, share);
|
|
|
|
curl_mprintf("PERFORM\n");
|
|
res = curl_easy_perform(curl);
|
|
|
|
/* try to free share, expect to fail because share is in use */
|
|
curl_mprintf("try SHARE_CLEANUP...\n");
|
|
scode = curl_share_cleanup(share);
|
|
if(scode == CURLSHE_OK) {
|
|
curl_mfprintf(stderr, "curl_share_cleanup succeed but error expected\n");
|
|
share = NULL;
|
|
}
|
|
else {
|
|
curl_mprintf("SHARE_CLEANUP failed, correct\n");
|
|
}
|
|
|
|
test_cleanup:
|
|
|
|
/* clean up last handle */
|
|
curl_mprintf("CLEANUP\n");
|
|
curl_easy_cleanup(curl);
|
|
|
|
/* free share */
|
|
curl_mprintf("SHARE_CLEANUP\n");
|
|
scode = curl_share_cleanup(share);
|
|
if(scode != CURLSHE_OK)
|
|
curl_mfprintf(stderr, "curl_share_cleanup failed, code errno %d\n",
|
|
scode);
|
|
|
|
curl_mprintf("GLOBAL_CLEANUP\n");
|
|
curl_global_cleanup();
|
|
|
|
return res;
|
|
}
|