mirror of
https://github.com/curl/curl.git
synced 2026-04-15 02:21:41 +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
244 lines
5.9 KiB
C
244 lines
5.9 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 "uint-hash.h"
|
|
|
|
/* random patterns for API verification */
|
|
#ifdef DEBUGBUILD
|
|
#define CURL_UINT32_HASHINIT 0x7117e779
|
|
#endif
|
|
|
|
static uint32_t uint32_hash_hash(uint32_t id, uint32_t slots)
|
|
{
|
|
return (id % slots);
|
|
}
|
|
|
|
|
|
struct uint_hash_entry {
|
|
struct uint_hash_entry *next;
|
|
void *value;
|
|
uint32_t id;
|
|
};
|
|
|
|
void Curl_uint32_hash_init(struct uint_hash *h,
|
|
uint32_t slots,
|
|
Curl_uint32_hash_dtor *dtor)
|
|
{
|
|
DEBUGASSERT(h);
|
|
DEBUGASSERT(slots);
|
|
|
|
h->table = NULL;
|
|
h->dtor = dtor;
|
|
h->size = 0;
|
|
h->slots = slots;
|
|
#ifdef DEBUGBUILD
|
|
h->init = CURL_UINT32_HASHINIT;
|
|
#endif
|
|
}
|
|
|
|
static struct uint_hash_entry *uint32_hash_mk_entry(uint32_t id, void *value)
|
|
{
|
|
struct uint_hash_entry *e;
|
|
|
|
/* allocate the struct for the hash entry */
|
|
e = curlx_malloc(sizeof(*e));
|
|
if(e) {
|
|
e->id = id;
|
|
e->next = NULL;
|
|
e->value = value;
|
|
}
|
|
return e;
|
|
}
|
|
|
|
static void uint32_hash_entry_clear(struct uint_hash *h,
|
|
struct uint_hash_entry *e)
|
|
{
|
|
DEBUGASSERT(h);
|
|
DEBUGASSERT(e);
|
|
if(e->value) {
|
|
if(h->dtor)
|
|
h->dtor(e->id, e->value);
|
|
e->value = NULL;
|
|
}
|
|
}
|
|
|
|
static void uint32_hash_entry_destroy(struct uint_hash *h,
|
|
struct uint_hash_entry *e)
|
|
{
|
|
uint32_hash_entry_clear(h, e);
|
|
curlx_free(e);
|
|
}
|
|
|
|
static void uint32_hash_entry_unlink(struct uint_hash *h,
|
|
struct uint_hash_entry **he_anchor,
|
|
struct uint_hash_entry *he)
|
|
{
|
|
*he_anchor = he->next;
|
|
--h->size;
|
|
}
|
|
|
|
static void uint32_hash_elem_link(struct uint_hash *h,
|
|
struct uint_hash_entry **he_anchor,
|
|
struct uint_hash_entry *he)
|
|
{
|
|
he->next = *he_anchor;
|
|
*he_anchor = he;
|
|
++h->size;
|
|
}
|
|
|
|
#define CURL_UINT32_HASH_SLOT(h,id) h->table[uint32_hash_hash(id, h->slots)]
|
|
#define CURL_UINT32_HASH_SLOT_ADDR(h,id) &CURL_UINT32_HASH_SLOT(h,id)
|
|
|
|
bool Curl_uint32_hash_set(struct uint_hash *h, uint32_t id, void *value)
|
|
{
|
|
struct uint_hash_entry *he, **slot;
|
|
|
|
DEBUGASSERT(h);
|
|
DEBUGASSERT(h->slots);
|
|
DEBUGASSERT(h->init == CURL_UINT32_HASHINIT);
|
|
if(!h->table) {
|
|
h->table = curlx_calloc(h->slots, sizeof(*he));
|
|
if(!h->table)
|
|
return FALSE; /* OOM */
|
|
}
|
|
|
|
slot = CURL_UINT32_HASH_SLOT_ADDR(h, id);
|
|
for(he = *slot; he; he = he->next) {
|
|
if(he->id == id) {
|
|
/* existing key entry, overwrite by clearing old pointer */
|
|
uint32_hash_entry_clear(h, he);
|
|
he->value = value;
|
|
return TRUE;
|
|
}
|
|
}
|
|
|
|
he = uint32_hash_mk_entry(id, value);
|
|
if(!he)
|
|
return FALSE; /* OOM */
|
|
|
|
uint32_hash_elem_link(h, slot, he);
|
|
return TRUE;
|
|
}
|
|
|
|
bool Curl_uint32_hash_remove(struct uint_hash *h, uint32_t id)
|
|
{
|
|
DEBUGASSERT(h);
|
|
DEBUGASSERT(h->slots);
|
|
DEBUGASSERT(h->init == CURL_UINT32_HASHINIT);
|
|
if(h->table) {
|
|
struct uint_hash_entry *he, **he_anchor;
|
|
|
|
he_anchor = CURL_UINT32_HASH_SLOT_ADDR(h, id);
|
|
while(*he_anchor) {
|
|
he = *he_anchor;
|
|
if(id == he->id) {
|
|
uint32_hash_entry_unlink(h, he_anchor, he);
|
|
uint32_hash_entry_destroy(h, he);
|
|
return TRUE;
|
|
}
|
|
he_anchor = &he->next;
|
|
}
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
void *Curl_uint32_hash_get(struct uint_hash *h, uint32_t id)
|
|
{
|
|
DEBUGASSERT(h);
|
|
DEBUGASSERT(h->init == CURL_UINT32_HASHINIT);
|
|
if(h->table) {
|
|
struct uint_hash_entry *he;
|
|
DEBUGASSERT(h->slots);
|
|
he = CURL_UINT32_HASH_SLOT(h, id);
|
|
while(he) {
|
|
if(id == he->id) {
|
|
return he->value;
|
|
}
|
|
he = he->next;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static void uint_hash_clear(struct uint_hash *h)
|
|
{
|
|
if(h && h->table) {
|
|
struct uint_hash_entry *he, **he_anchor;
|
|
size_t i;
|
|
DEBUGASSERT(h->init == CURL_UINT32_HASHINIT);
|
|
for(i = 0; i < h->slots; ++i) {
|
|
he_anchor = &h->table[i];
|
|
while(*he_anchor) {
|
|
he = *he_anchor;
|
|
uint32_hash_entry_unlink(h, he_anchor, he);
|
|
uint32_hash_entry_destroy(h, he);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifdef UNITTESTS
|
|
UNITTEST void Curl_uint32_hash_clear(struct uint_hash *h)
|
|
{
|
|
uint_hash_clear(h);
|
|
}
|
|
#endif
|
|
|
|
void Curl_uint32_hash_destroy(struct uint_hash *h)
|
|
{
|
|
DEBUGASSERT(h->init == CURL_UINT32_HASHINIT);
|
|
if(h->table) {
|
|
uint_hash_clear(h);
|
|
Curl_safefree(h->table);
|
|
}
|
|
DEBUGASSERT(h->size == 0);
|
|
h->slots = 0;
|
|
}
|
|
|
|
uint32_t Curl_uint32_hash_count(struct uint_hash *h)
|
|
{
|
|
DEBUGASSERT(h->init == CURL_UINT32_HASHINIT);
|
|
return h->size;
|
|
}
|
|
|
|
void Curl_uint32_hash_visit(struct uint_hash *h,
|
|
Curl_uint32_hash_visit_cb *cb,
|
|
void *user_data)
|
|
{
|
|
if(h && h->table && cb) {
|
|
struct uint_hash_entry *he;
|
|
size_t i;
|
|
DEBUGASSERT(h->init == CURL_UINT32_HASHINIT);
|
|
for(i = 0; i < h->slots; ++i) {
|
|
for(he = h->table[i]; he; he = he->next) {
|
|
if(!cb(he->id, he->value, user_data))
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|