dep-curl/lib/uint-hashset.c
Stefan Eissing c8df3defd9
lib: new easy option string storage
Change the storage of easy handle option strings from an array sized for
all possible options to a hash set to reduce memory footprint.

Give the hash set initially room for 4 strings, with first allocation
happening when it goes beyond that. Measurements without test suite
and a forced fail on growing the set gives:

Size Result
2    1261 tests out of 1951 reported OK: 64%
4    1792 tests out of 1951 reported OK: 91%
8    1944 tests out of 1951 reported OK: 99%
16   1949 tests out of 1951 reported OK: 99%
32   single fail of 3211, unit test for u8_strset

Add u8_strset that keeps the tuples (uint8_t id, char *str)
and allows set/unset by `id`. Add that as data->set.strings.

Define MACROS
* CURL_EASY_STR(data, id) for access
* CURL_EASY_STR_SET(data, id, s) for setting, making a copy
* CURL_EASY_STR_SETN(data, id, s) for setting, no copy
* CURL_EASY_STR_CLEAR(data, id) for unsetting
* CURL_EASY_STR_CLEAR0(data, id) for unsetting and zero-ing value

Add `data->set.str_copypostfields` to handle former `STRING_COPYPOSTFIELDS`
string that was not always a string and could carry NUL bytes.

Add unit tests to test3211.

Closes #22628
2026-08-21 09:36:07 +02:00

305 lines
8.5 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 "uint-hashset.h"
/* random patterns for API verification */
#ifdef DEBUGBUILD
#define CURL_U8_STRSET_MAGIC 0x7117e783
#endif
#define CURL_U8_STRSET_DEBUG 0
#define CURL_SWAP(a, b) (((a) ^= (b)), ((b) ^= (a)), ((a) ^= (b)))
static const uint8_t u8_smask[] = {
0x00U,
0x01U,
0x03U,
0x07U,
0x0FU,
0x1FU,
0x3FU,
0x7FU,
0xFFU,
};
#define CURL_U8_SET_SLOT_IDX(s, i) (uint8_t)((i) & u8_smask[(s)->slotbits])
#define CURL_U8_SLOT_CNT(i) ((uint16_t)u8_smask[(i)] + 1)
#define CURL_U8_SET_SLOT_CNT(s) CURL_U8_SLOT_CNT((s)->slotbits)
/* A hashset for tuples (id, string) using Robin Hood Hashing.
* <https://www.cs.cornell.edu/courses/JavaAndDS/files/hashing_RobinHood.pdf>
* The basic idea here to handle collisions by robbing "rich" entries and
* giving to the "poor":
* - We have an array: (id, string) are ideally placed at index "id % size".
* - If slot at index is already occupied, we have a collision.
* - A simple collision strategy would look at the next index, and the
* next until until finding an empty slot.
* - The drawback is that this may lead to many checks on lookups, as it
* will need to also look at subsequent slots until it finds the match.
* The amount of lookups is the "probe sequence length" (psl) and this
* may vary greatly between entries.
* - Robin Hood Hashing balances the 'psl's of all entries more evenly:
* - psl == 0 means an entry is in exactly the right slot
* - pasl == 1 means it is in the slot right after. psl == 2 is the slot
* after that, etc.
* - when inserting a new entry, track its psl. Finding a slot where
* the existing entry has a lower psl makes a swap. Put the new entry
* and its psl there, take the previous entry and its psl and find
* the next best slot for the previous entry. */
void Curl_u8_strset_init(struct u8_strset *set)
{
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif
memset(set, 0, sizeof(*set));
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic pop
#endif
set->data = set->sdata;
set->ids = set->sids;
set->psl = set->spsl;
set->slotbits = CURL_U8_STRSET_START_BITS;
set->count = 0;
#ifdef DEBUGBUILD
set->init = CURL_U8_STRSET_MAGIC;
#endif
}
void Curl_u8_strset_clear(struct u8_strset *set)
{
uint16_t i;
DEBUGASSERT(set->init == CURL_U8_STRSET_MAGIC);
for(i = 0; i < CURL_U8_SET_SLOT_CNT(set); ++i)
curlx_safefree(set->data[i]);
if(set->data != set->sdata)
curlx_safefree(set->data);
Curl_u8_strset_init(set);
}
static void u8_strset_addn(struct u8_strset *set, uint8_t id, char *val)
{
uint8_t i = CURL_U8_SET_SLOT_IDX(set, id);
uint8_t psl = 0;
while(set->data[i]) {
if(psl > set->psl[i]) { /* SWAP */
char *tmpdata;
tmpdata = set->data[i];
set->data[i] = val;
val = tmpdata;
CURL_SWAP(set->psl[i], psl);
CURL_SWAP(set->ids[i], id);
}
i = CURL_U8_SET_SLOT_IDX(set, i + 1);
++psl;
}
set->ids[i] = id;
set->data[i] = val;
set->psl[i] = psl;
++set->count;
}
static bool u8_strset_grow(struct u8_strset *set)
{
uint8_t i, *prev_ids, nslotbits;
uint16_t prev_slots;
char **prev_data;
size_t nslots;
void *d;
if(set->slotbits >= 8)
return FALSE;
nslotbits = (uint8_t)(set->slotbits + 1);
#if CURL_U8_STRSET_DEBUG
curl_mfprintf(stderr, "u8_strset_grow from %d to %d\n",
set->slotbits, nslotbits);
#endif
nslots = CURL_U8_SLOT_CNT(nslotbits);
d = curlx_calloc(1, (nslots * sizeof(char *)) + (2 * nslots));
if(!d)
return FALSE;
prev_data = set->data;
prev_ids = set->ids;
prev_slots = set->slotbits;
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wanalyzer-allocation-size"
#endif
set->data = (char **)d;
#if defined(__GNUC__) && __GNUC__ >= 13
#pragma GCC diagnostic pop
#endif
set->ids = (uint8_t *)d + (nslots * sizeof(char *));
set->psl = set->ids + nslots;
set->slotbits = nslotbits;
set->count = 0;
/* re-add previous entries */
for(i = 0; i < CURL_U8_SLOT_CNT(prev_slots); ++i) {
if(prev_data[i])
u8_strset_addn(set, prev_ids[i], prev_data[i]);
}
if(prev_data != set->sdata)
curlx_free(prev_data);
return TRUE;
}
static bool u8_strset_get_index(struct u8_strset *set,
uint8_t id, uint8_t *pindex)
{
uint8_t i = CURL_U8_SET_SLOT_IDX(set, id);
uint8_t psl = 0;
while(set->data[i] && (psl <= set->psl[i])) {
if(set->ids[i] == id) {
*pindex = i;
#if CURL_U8_STRSET_DEBUG
curl_mfprintf(stderr, "u8_strset_index %d=%s\n", id, set->data[i]);
#endif
return TRUE;
}
i = CURL_U8_SET_SLOT_IDX(set, i + 1);
++psl;
}
#if CURL_U8_STRSET_DEBUG
curl_mfprintf(stderr, "u8_strset_index %d not found\n", id);
#endif
*pindex = 0;
return FALSE;
}
uint16_t Curl_u8_strset_count(struct u8_strset *set)
{
return set->count;
}
const char *Curl_u8_strset_get(struct u8_strset *set, uint8_t id)
{
uint8_t i;
DEBUGASSERT(set->init == CURL_U8_STRSET_MAGIC);
if(u8_strset_get_index(set, id, &i))
return set->data[i];
return NULL;
}
CURLcode Curl_u8_strset_setn(struct u8_strset *set,
uint8_t id, char *str)
{
uint8_t i;
DEBUGASSERT(set->init == CURL_U8_STRSET_MAGIC);
#if CURL_U8_STRSET_DEBUG
curl_mfprintf(stderr, "u8_strset_setn %d=%s\n", id, str);
#endif
if(!str) {
Curl_u8_strset_unset(set, id);
return CURLE_OK;
}
if(u8_strset_get_index(set, id, &i)) {
/* `id` is in set, replace value */
curlx_free(set->data[i]);
set->data[i] = str;
return CURLE_OK;
}
/* `id` not in set yet, grow if full */
if((set->count >= CURL_U8_SET_SLOT_CNT(set)) && !u8_strset_grow(set)) {
curlx_free(str);
return CURLE_OUT_OF_MEMORY;
}
u8_strset_addn(set, id, str);
return CURLE_OK;
}
CURLcode Curl_u8_strset_set(struct u8_strset *set,
uint8_t id, const char *str)
{
char *val;
DEBUGASSERT(set->init == CURL_U8_STRSET_MAGIC);
if(!str) {
Curl_u8_strset_unset(set, id);
return CURLE_OK;
}
val = curlx_strdup(str);
if(!val)
return CURLE_OUT_OF_MEMORY;
return Curl_u8_strset_setn(set, id, val);
}
static void u8_strset_unset(struct u8_strset *set, uint8_t id, bool zero)
{
uint8_t i, j;
DEBUGASSERT(set->init == CURL_U8_STRSET_MAGIC);
if(u8_strset_get_index(set, id, &i)) {
/* `id` is in set */
if(zero)
curlx_strzero(set->data[i]);
curlx_safefree(set->data[i]);
set->ids[i] = set->psl[i] = 0;
--set->count;
j = CURL_U8_SET_SLOT_IDX(set, i + 1);
/* shift all entries with positive psl "down" */
while(set->data[j] && set->psl[j]) {
set->data[i] = set->data[j];
set->ids[i] = set->ids[j];
set->psl[i] = (uint8_t)(set->psl[j] - 1);
set->data[j] = NULL;
set->ids[j] = set->psl[j] = 0;
i = j;
j = CURL_U8_SET_SLOT_IDX(set, i + 1);
}
}
}
void Curl_u8_strset_unset(struct u8_strset *set, uint8_t id)
{
u8_strset_unset(set, id, FALSE);
}
void Curl_u8_strset_unset0(struct u8_strset *set, uint8_t id)
{
u8_strset_unset(set, id, TRUE);
}
CURLcode Curl_u8_strset_copy(struct u8_strset *dest, struct u8_strset *src)
{
CURLcode result = CURLE_OK;
uint16_t i;
DEBUGASSERT(src->init == CURL_U8_STRSET_MAGIC);
Curl_u8_strset_clear(dest);
for(i = 0; !result && (i < CURL_U8_SET_SLOT_CNT(src)); ++i) {
if(src->data[i])
result = Curl_u8_strset_set(dest, src->ids[i], src->data[i]);
}
return result;
}