* [PATCH 0/3] switch to tombstone-free khashl table
@ 2024-03-25 23:07 Eric Wong
2024-03-25 23:07 ` [PATCH 1/3] list-objects-filter: use kh_size API Eric Wong
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Eric Wong @ 2024-03-25 23:07 UTC (permalink / raw)
To: git
The memory improvement is minor, but any memory reduction at all
is welcome at this point. Fortunately, this set of changes is
unintrusive.
I have some other ideas that I'll hopefully get to implement before
swapping kills all my SSDs (see bottom).
Eric Wong (3):
list-objects-filter: use kh_size API
treewide: switch to khashl for memory savings
khashl: fix ensemble lookups on empty table
builtin/fast-import.c | 2 +-
builtin/fsmonitor--daemon.c | 4 +-
delta-islands.c | 4 +-
khash.h | 338 -----------------------
khashl.h | 522 ++++++++++++++++++++++++++++++++++++
list-objects-filter.c | 2 +-
object-store-ll.h | 2 +-
object-store.h | 7 +-
oidset.h | 2 +-
pack-bitmap.h | 2 +-
10 files changed, 535 insertions(+), 350 deletions(-)
delete mode 100644 khash.h
create mode 100644 khashl.h
TODO (some ideas stolen from khashl):
* obj_hash can probably use a 0.75 load factor (instead of 0.5)
to save memory and not slow down too much. oid_* khash has
always had 0.77 which was fine and now khashl has 0.75.
0.75 is cheaper to compute via (shifts + ORs) than 0.77.
* obj_hash can use `i = (i + 1) & mask' like khashl does to
avoid branches in linear probe loops
* obj_hash can use realloc and copy in-place resize logic khashl does.
khashl uses the ->used bitmap for this, but it should be
possible to do for obj_hash w/o additional allocations
via pointer tagging
(not khashl inspired):
* keep an identity pool of OIDs separately (similar to how Perl5
pools all hash keys) and only use tagged pointers for OIDs.
Pointer tagging can be used to distinguish between 7 hash
functions, leaving us room for 5 more in addition to SHA-(1|256).
This change will be a large effort (with a hopefully large savings).
If we ever need more than 7 hash functions, we can switch to
storing hash type information in slabs that can be looked up
using address ranges (AFAIK, jemalloc does this).
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/3] list-objects-filter: use kh_size API
2024-03-25 23:07 [PATCH 0/3] switch to tombstone-free khashl table Eric Wong
@ 2024-03-25 23:07 ` Eric Wong
2024-03-25 23:07 ` [PATCH 2/3] treewide: switch to khashl for memory savings Eric Wong
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Eric Wong @ 2024-03-25 23:07 UTC (permalink / raw)
To: git
In order to ease a potential migration to from khash to khashl,
use the kh_size() macro instead of accessing the .size field
directly.
Signed-off-by: Eric Wong <e@80x24.org>
---
list-objects-filter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/list-objects-filter.c b/list-objects-filter.c
index 4346f8da45..440f112d23 100644
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -704,7 +704,7 @@ static void filter_combine__free(void *filter_data)
for (sub = 0; sub < d->nr; sub++) {
list_objects_filter__free(d->sub[sub].filter);
oidset_clear(&d->sub[sub].seen);
- if (d->sub[sub].omits.set.size)
+ if (kh_size(&d->sub[sub].omits.set))
BUG("expected oidset to be cleared already");
}
free(d->sub);
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3] treewide: switch to khashl for memory savings
2024-03-25 23:07 [PATCH 0/3] switch to tombstone-free khashl table Eric Wong
2024-03-25 23:07 ` [PATCH 1/3] list-objects-filter: use kh_size API Eric Wong
@ 2024-03-25 23:07 ` Eric Wong
2024-03-26 17:48 ` Junio C Hamano
2024-03-25 23:07 ` [PATCH 3/3] khashl: fix ensemble lookups on empty table Eric Wong
` (2 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Eric Wong @ 2024-03-25 23:07 UTC (permalink / raw)
To: git
khashl is an updated version of khash with less memory overhead
(one bit/bucket instead of two) than the original khash and
similar overall performance. Insertions are simpler (linear
probing) but deletions may be slightly slower[1]. Of course,
the majority of hash tables in git do not delete individual
elements.
Overall memory usage did not decrease much, as the hash tables
and elements we store in them are big and currently dwarf the
overhead of the khash internals. Only around 10 MB in
allocations (not peak use) is saved when doing a no-op `git gc'
of a Linux kernel object store with thousands of refs and
islands.
A summary of differences I've found from khash to khashl:
* two 32-bit ints (instead of four) in the top-level struct
* 2 heap allocations (instead of 3) for maps
(though I wonder locality suffers when probing is necessary)
* 1 bit of metadata per-bucket (no tombstones for deleted elements)
* 0.75 load factor. Lowered slightly from 0.77, but no FP multiply
and responsible for the aforementioned struct size reduction
* FNV-1A instead of x31 hash for strings
* Fibonacci hashing (__kh_h2b), probably good for FNV-1A, but
I'm skeptical of its usefulness for our SHA-* using cases
* linear probing instead of quadratic
* Wang's integer hash functions (currently unused)
* optional hash value caching and ensemble APIs (currently unused)
* some API differences (see below), but not enough to easily
use both khash and khashl in the same compilation unit
This patch was made with two additional goals to ease review:
1) minimize changes outside of khash*.h files
2) minimize and document all differences from upstream[2] khashl.h
Our khashl.h differences from upstream:
* favor portability constructs from our codebase:
MAYBE_UNUSED over klib_unused, inline over kh_inline, and
various integer types
* disable packed attribute to satisfy -Werror=address-of-packed-member,
AFAIK it doesn't change any of the data structures we use
* port the following commits over from our old khash.h:
9249ca26aca3 (khash: factor out kh_release_*, 2018-10-04)
2756ca4347cb (use REALLOC_ARRAY for changing the allocation size of arrays, 2014-09-16)
5632e838f8fa (khash: clarify that allocations never fail, 2021-07-03)
* use our memory allocation wrappers
* provide wrappers for compatibility with existing callers using the
khash API. The khashl function naming convention is: ${NOUN}_${VERB}
while the khash convention is: kh_${VERB}_${NOUN}. The kh_${NAME}_t
typedef and naming convention are preserved via __KHASH_COMPAT macro
to ease review (despite the `_t' suffix being reserved and typedefs
being discouraged in the Linux kernel).
* copy relevant API docs over from khash.h for identically named macros
* preserve kh_begin, kh_foreach, kh_foreach_value from khash.h since
khashl.h doesn't provide them
* flesh out KHASHL_{SET,MAP}_INIT wrappers with *_clear, *_resize,
and *_release functions
[1] https://attractivechaos.wordpress.com/2019/12/28/deletion-from-hash-tables-without-tombstones/
[2] git clone https://github.com/attractivechaos/klib.git
2895a16cb55e (support an ensemble of hash tables, 2023-12-18)
khashl.h API differences from khash.h which affected this change:
* KHASHL_MAP_INIT and KHASHL_SET_INIT macros replace KHASH_INIT
* user-supplied hash and equality functions use different names
* object-store-ll.h avoided the kh_*_t convention (since I dislike
typedef) and was the only place where I had to change a definition.
Signed-off-by: Eric Wong <e@80x24.org>
---
The git-specific changes are absolutely minimal :>
builtin/fast-import.c | 2 +-
builtin/fsmonitor--daemon.c | 4 +-
delta-islands.c | 4 +-
khash.h | 338 -----------------------
khashl.h | 522 ++++++++++++++++++++++++++++++++++++
object-store-ll.h | 2 +-
object-store.h | 7 +-
oidset.h | 2 +-
pack-bitmap.h | 2 +-
9 files changed, 534 insertions(+), 349 deletions(-)
delete mode 100644 khash.h
create mode 100644 khashl.h
diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 71a195ca22..29e50fd675 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -24,7 +24,7 @@
#include "object-store-ll.h"
#include "mem-pool.h"
#include "commit-reach.h"
-#include "khash.h"
+#include "khashl.h"
#include "date.h"
#define PACK_ID_BITS 16
diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
index 1593713f4c..1c71d96c6d 100644
--- a/builtin/fsmonitor--daemon.c
+++ b/builtin/fsmonitor--daemon.c
@@ -13,7 +13,7 @@
#include "fsmonitor--daemon.h"
#include "repository.h"
#include "simple-ipc.h"
-#include "khash.h"
+#include "khashl.h"
#include "run-command.h"
#include "trace.h"
#include "trace2.h"
@@ -650,7 +650,7 @@ static int fsmonitor_parse_client_token(const char *buf_token,
return 0;
}
-KHASH_INIT(str, const char *, int, 0, kh_str_hash_func, kh_str_hash_equal)
+KHASHL_SET_INIT(KH_LOCAL, kh_str, str, const char *, kh_hash_str, kh_eq_str)
static int do_handle_client(struct fsmonitor_daemon_state *state,
const char *command,
diff --git a/delta-islands.c b/delta-islands.c
index ee2318d45a..aa35839f15 100644
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -10,14 +10,14 @@
#include "diff.h"
#include "progress.h"
#include "refs.h"
-#include "khash.h"
+#include "khashl.h"
#include "pack-bitmap.h"
#include "pack-objects.h"
#include "delta-islands.h"
#include "oid-array.h"
#include "config.h"
-KHASH_INIT(str, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)
+KHASHL_MAP_INIT(KH_LOCAL, kh_str, str, const char *, void *, kh_hash_str, kh_eq_str)
static kh_oid_map_t *island_marks;
static unsigned island_counter;
diff --git a/khash.h b/khash.h
deleted file mode 100644
index ff88163177..0000000000
--- a/khash.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/* The MIT License
-
- Copyright (c) 2008, 2009, 2011 by Attractive Chaos <attractor@live.co.uk>
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-*/
-
-#ifndef __AC_KHASH_H
-#define __AC_KHASH_H
-
-#include "hash.h"
-
-#define AC_VERSION_KHASH_H "0.2.8"
-
-typedef uint32_t khint32_t;
-typedef uint64_t khint64_t;
-
-typedef khint32_t khint_t;
-typedef khint_t khiter_t;
-
-#define __ac_isempty(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&2)
-#define __ac_isdel(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&1)
-#define __ac_iseither(flag, i) ((flag[i>>4]>>((i&0xfU)<<1))&3)
-#define __ac_set_isdel_false(flag, i) (flag[i>>4]&=~(1ul<<((i&0xfU)<<1)))
-#define __ac_set_isempty_false(flag, i) (flag[i>>4]&=~(2ul<<((i&0xfU)<<1)))
-#define __ac_set_isboth_false(flag, i) (flag[i>>4]&=~(3ul<<((i&0xfU)<<1)))
-#define __ac_set_isdel_true(flag, i) (flag[i>>4]|=1ul<<((i&0xfU)<<1))
-
-#define __ac_fsize(m) ((m) < 16? 1 : (m)>>4)
-
-#define kroundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x))
-
-static inline khint_t __ac_X31_hash_string(const char *s)
-{
- khint_t h = (khint_t)*s;
- if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)*s;
- return h;
-}
-
-#define kh_str_hash_func(key) __ac_X31_hash_string(key)
-#define kh_str_hash_equal(a, b) (strcmp(a, b) == 0)
-
-static const double __ac_HASH_UPPER = 0.77;
-
-#define __KHASH_TYPE(name, khkey_t, khval_t) \
- typedef struct kh_##name { \
- khint_t n_buckets, size, n_occupied, upper_bound; \
- khint32_t *flags; \
- khkey_t *keys; \
- khval_t *vals; \
- } kh_##name##_t;
-
-#define __KHASH_PROTOTYPES(name, khkey_t, khval_t) \
- kh_##name##_t *kh_init_##name(void); \
- void kh_destroy_##name(kh_##name##_t *h); \
- void kh_clear_##name(kh_##name##_t *h); \
- khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \
- void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
- khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
- void kh_del_##name(kh_##name##_t *h, khint_t x);
-
-#define __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
- SCOPE kh_##name##_t *kh_init_##name(void) { \
- return (kh_##name##_t*)xcalloc(1, sizeof(kh_##name##_t)); \
- } \
- SCOPE void kh_release_##name(kh_##name##_t *h) \
- { \
- free(h->flags); \
- free((void *)h->keys); \
- free((void *)h->vals); \
- } \
- SCOPE void kh_destroy_##name(kh_##name##_t *h) \
- { \
- if (h) { \
- kh_release_##name(h); \
- free(h); \
- } \
- } \
- SCOPE void kh_clear_##name(kh_##name##_t *h) \
- { \
- if (h && h->flags) { \
- memset(h->flags, 0xaa, __ac_fsize(h->n_buckets) * sizeof(khint32_t)); \
- h->size = h->n_occupied = 0; \
- } \
- } \
- SCOPE khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key) \
- { \
- if (h->n_buckets) { \
- khint_t k, i, last, mask, step = 0; \
- mask = h->n_buckets - 1; \
- k = __hash_func(key); i = k & mask; \
- last = i; \
- while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
- i = (i + (++step)) & mask; \
- if (i == last) return h->n_buckets; \
- } \
- return __ac_iseither(h->flags, i)? h->n_buckets : i; \
- } else return 0; \
- } \
- SCOPE void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
- { /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \
- khint32_t *new_flags = NULL; \
- khint_t j = 1; \
- { \
- kroundup32(new_n_buckets); \
- if (new_n_buckets < 4) new_n_buckets = 4; \
- if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0; /* requested size is too small */ \
- else { /* hash table size to be changed (shrink or expand); rehash */ \
- ALLOC_ARRAY(new_flags, __ac_fsize(new_n_buckets)); \
- memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
- if (h->n_buckets < new_n_buckets) { /* expand */ \
- REALLOC_ARRAY(h->keys, new_n_buckets); \
- if (kh_is_map) { \
- REALLOC_ARRAY(h->vals, new_n_buckets); \
- } \
- } /* otherwise shrink */ \
- } \
- } \
- if (j) { /* rehashing is needed */ \
- for (j = 0; j != h->n_buckets; ++j) { \
- if (__ac_iseither(h->flags, j) == 0) { \
- khkey_t key = h->keys[j]; \
- khval_t val; \
- khint_t new_mask; \
- new_mask = new_n_buckets - 1; \
- if (kh_is_map) val = h->vals[j]; \
- __ac_set_isdel_true(h->flags, j); \
- while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \
- khint_t k, i, step = 0; \
- k = __hash_func(key); \
- i = k & new_mask; \
- while (!__ac_isempty(new_flags, i)) i = (i + (++step)) & new_mask; \
- __ac_set_isempty_false(new_flags, i); \
- if (i < h->n_buckets && __ac_iseither(h->flags, i) == 0) { /* kick out the existing element */ \
- { khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \
- if (kh_is_map) { khval_t tmp = h->vals[i]; h->vals[i] = val; val = tmp; } \
- __ac_set_isdel_true(h->flags, i); /* mark it as deleted in the old hash table */ \
- } else { /* write the element and jump out of the loop */ \
- h->keys[i] = key; \
- if (kh_is_map) h->vals[i] = val; \
- break; \
- } \
- } \
- } \
- } \
- if (h->n_buckets > new_n_buckets) { /* shrink the hash table */ \
- REALLOC_ARRAY(h->keys, new_n_buckets); \
- if (kh_is_map) REALLOC_ARRAY(h->vals, new_n_buckets); \
- } \
- free(h->flags); /* free the working space */ \
- h->flags = new_flags; \
- h->n_buckets = new_n_buckets; \
- h->n_occupied = h->size; \
- h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
- } \
- } \
- SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
- { \
- khint_t x; \
- if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
- if (h->n_buckets > (h->size<<1)) { \
- kh_resize_##name(h, h->n_buckets - 1); /* clear "deleted" elements */ \
- } else { \
- kh_resize_##name(h, h->n_buckets + 1); /* expand the hash table */ \
- } \
- } /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
- { \
- khint_t k, i, site, last, mask = h->n_buckets - 1, step = 0; \
- x = site = h->n_buckets; k = __hash_func(key); i = k & mask; \
- if (__ac_isempty(h->flags, i)) x = i; /* for speed up */ \
- else { \
- last = i; \
- while (!__ac_isempty(h->flags, i) && (__ac_isdel(h->flags, i) || !__hash_equal(h->keys[i], key))) { \
- if (__ac_isdel(h->flags, i)) site = i; \
- i = (i + (++step)) & mask; \
- if (i == last) { x = site; break; } \
- } \
- if (x == h->n_buckets) { \
- if (__ac_isempty(h->flags, i) && site != h->n_buckets) x = site; \
- else x = i; \
- } \
- } \
- } \
- if (__ac_isempty(h->flags, x)) { /* not present at all */ \
- h->keys[x] = key; \
- __ac_set_isboth_false(h->flags, x); \
- ++h->size; ++h->n_occupied; \
- *ret = 1; \
- } else if (__ac_isdel(h->flags, x)) { /* deleted */ \
- h->keys[x] = key; \
- __ac_set_isboth_false(h->flags, x); \
- ++h->size; \
- *ret = 2; \
- } else *ret = 0; /* Don't touch h->keys[x] if present and not deleted */ \
- return x; \
- } \
- SCOPE void kh_del_##name(kh_##name##_t *h, khint_t x) \
- { \
- if (x != h->n_buckets && !__ac_iseither(h->flags, x)) { \
- __ac_set_isdel_true(h->flags, x); \
- --h->size; \
- } \
- }
-
-#define KHASH_DECLARE(name, khkey_t, khval_t) \
- __KHASH_TYPE(name, khkey_t, khval_t) \
- __KHASH_PROTOTYPES(name, khkey_t, khval_t)
-
-#define KHASH_INIT2(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
- __KHASH_TYPE(name, khkey_t, khval_t) \
- __KHASH_IMPL(name, SCOPE, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
-
-#define KHASH_INIT(name, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal) \
- KHASH_INIT2(name, MAYBE_UNUSED static inline, khkey_t, khval_t, kh_is_map, __hash_func, __hash_equal)
-
-/* Other convenient macros... */
-
-/*! @function
- @abstract Test whether a bucket contains data.
- @param h Pointer to the hash table [khash_t(name)*]
- @param x Iterator to the bucket [khint_t]
- @return 1 if containing data; 0 otherwise [int]
- */
-#define kh_exist(h, x) (!__ac_iseither((h)->flags, (x)))
-
-/*! @function
- @abstract Get key given an iterator
- @param h Pointer to the hash table [khash_t(name)*]
- @param x Iterator to the bucket [khint_t]
- @return Key [type of keys]
- */
-#define kh_key(h, x) ((h)->keys[x])
-
-/*! @function
- @abstract Get value given an iterator
- @param h Pointer to the hash table [khash_t(name)*]
- @param x Iterator to the bucket [khint_t]
- @return Value [type of values]
- @discussion For hash sets, calling this results in segfault.
- */
-#define kh_val(h, x) ((h)->vals[x])
-
-/*! @function
- @abstract Alias of kh_val()
- */
-#define kh_value(h, x) ((h)->vals[x])
-
-/*! @function
- @abstract Get the start iterator
- @param h Pointer to the hash table [khash_t(name)*]
- @return The start iterator [khint_t]
- */
-#define kh_begin(h) (khint_t)(0)
-
-/*! @function
- @abstract Get the end iterator
- @param h Pointer to the hash table [khash_t(name)*]
- @return The end iterator [khint_t]
- */
-#define kh_end(h) ((h)->n_buckets)
-
-/*! @function
- @abstract Get the number of elements in the hash table
- @param h Pointer to the hash table [khash_t(name)*]
- @return Number of elements in the hash table [khint_t]
- */
-#define kh_size(h) ((h)->size)
-
-/*! @function
- @abstract Get the number of buckets in the hash table
- @param h Pointer to the hash table [khash_t(name)*]
- @return Number of buckets in the hash table [khint_t]
- */
-#define kh_n_buckets(h) ((h)->n_buckets)
-
-/*! @function
- @abstract Iterate over the entries in the hash table
- @param h Pointer to the hash table [khash_t(name)*]
- @param kvar Variable to which key will be assigned
- @param vvar Variable to which value will be assigned
- @param code Block of code to execute
- */
-#define kh_foreach(h, kvar, vvar, code) { khint_t __i; \
- for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \
- if (!kh_exist(h,__i)) continue; \
- (kvar) = kh_key(h,__i); \
- (vvar) = kh_val(h,__i); \
- code; \
- } }
-
-/*! @function
- @abstract Iterate over the values in the hash table
- @param h Pointer to the hash table [khash_t(name)*]
- @param vvar Variable to which value will be assigned
- @param code Block of code to execute
- */
-#define kh_foreach_value(h, vvar, code) { khint_t __i; \
- for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \
- if (!kh_exist(h,__i)) continue; \
- (vvar) = kh_val(h,__i); \
- code; \
- } }
-
-static inline unsigned int oidhash_by_value(struct object_id oid)
-{
- return oidhash(&oid);
-}
-
-static inline int oideq_by_value(struct object_id a, struct object_id b)
-{
- return oideq(&a, &b);
-}
-
-KHASH_INIT(oid_set, struct object_id, int, 0, oidhash_by_value, oideq_by_value)
-
-KHASH_INIT(oid_map, struct object_id, void *, 1, oidhash_by_value, oideq_by_value)
-
-KHASH_INIT(oid_pos, struct object_id, int, 1, oidhash_by_value, oideq_by_value)
-
-#endif /* __AC_KHASH_H */
diff --git a/khashl.h b/khashl.h
new file mode 100644
index 0000000000..3660fd2ce4
--- /dev/null
+++ b/khashl.h
@@ -0,0 +1,522 @@
+/* The MIT License
+
+ Copyright (c) 2019-2023 by Attractive Chaos <attractor@live.co.uk>
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+*/
+
+#ifndef __AC_KHASHL_H
+#define __AC_KHASHL_H
+
+#include "hash.h"
+
+#define AC_VERSION_KHASHL_H "0.2"
+
+typedef uint32_t khint32_t;
+typedef uint64_t khint64_t;
+
+typedef khint32_t khint_t;
+typedef khint_t khiter_t;
+
+#define kh_inline inline /* portably handled elsewhere */
+#define KH_LOCAL static kh_inline MAYBE_UNUSED
+
+#ifndef kcalloc
+#define kcalloc(N,Z) xcalloc(N,Z)
+#endif
+#ifndef kfree
+#define kfree(P) free(P)
+#endif
+
+/****************************
+ * Simple private functions *
+ ****************************/
+
+#define __kh_used(flag, i) (flag[i>>5] >> (i&0x1fU) & 1U)
+#define __kh_set_used(flag, i) (flag[i>>5] |= 1U<<(i&0x1fU))
+#define __kh_set_unused(flag, i) (flag[i>>5] &= ~(1U<<(i&0x1fU)))
+
+#define __kh_fsize(m) ((m) < 32? 1 : (m)>>5)
+
+static kh_inline khint_t __kh_h2b(khint_t hash, khint_t bits) { return hash * 2654435769U >> (32 - bits); }
+
+/*******************
+ * Hash table base *
+ *******************/
+
+#define __KHASHL_TYPE(HType, khkey_t) \
+ typedef struct HType { \
+ khint_t bits, count; \
+ khint32_t *used; \
+ khkey_t *keys; \
+ } HType;
+
+#define __KHASHL_PROTOTYPES(HType, prefix, khkey_t) \
+ extern HType *prefix##_init(void); \
+ extern void prefix##_destroy(HType *h); \
+ extern void prefix##_clear(HType *h); \
+ extern khint_t prefix##_getp(const HType *h, const khkey_t *key); \
+ extern void prefix##_resize(HType *h, khint_t new_n_buckets); \
+ extern khint_t prefix##_putp(HType *h, const khkey_t *key, int *absent); \
+ extern void prefix##_del(HType *h, khint_t k);
+
+#define __KHASHL_IMPL_BASIC(SCOPE, HType, prefix) \
+ SCOPE HType *prefix##_init(void) { \
+ return (HType*)kcalloc(1, sizeof(HType)); \
+ } \
+ SCOPE void prefix##_release(HType *h) { \
+ kfree((void *)h->keys); kfree(h->used); \
+ } \
+ SCOPE void prefix##_destroy(HType *h) { \
+ if (!h) return; \
+ prefix##_release(h); \
+ kfree(h); \
+ } \
+ SCOPE void prefix##_clear(HType *h) { \
+ if (h && h->used) { \
+ khint_t n_buckets = (khint_t)1U << h->bits; \
+ memset(h->used, 0, __kh_fsize(n_buckets) * sizeof(khint32_t)); \
+ h->count = 0; \
+ } \
+ }
+
+#define __KHASHL_IMPL_GET(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ SCOPE khint_t prefix##_getp_core(const HType *h, const khkey_t *key, khint_t hash) { \
+ khint_t i, last, n_buckets, mask; \
+ if (h->keys == 0) return 0; \
+ n_buckets = (khint_t)1U << h->bits; \
+ mask = n_buckets - 1U; \
+ i = last = __kh_h2b(hash, h->bits); \
+ while (__kh_used(h->used, i) && !__hash_eq(h->keys[i], *key)) { \
+ i = (i + 1U) & mask; \
+ if (i == last) return n_buckets; \
+ } \
+ return !__kh_used(h->used, i)? n_buckets : i; \
+ } \
+ SCOPE khint_t prefix##_getp(const HType *h, const khkey_t *key) { return prefix##_getp_core(h, key, __hash_fn(*key)); } \
+ SCOPE khint_t prefix##_get(const HType *h, khkey_t key) { return prefix##_getp_core(h, &key, __hash_fn(key)); }
+
+#define __KHASHL_IMPL_RESIZE(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ SCOPE void prefix##_resize(HType *h, khint_t new_n_buckets) { \
+ khint32_t *new_used = 0; \
+ khint_t j = 0, x = new_n_buckets, n_buckets, new_bits, new_mask; \
+ while ((x >>= 1) != 0) ++j; \
+ if (new_n_buckets & (new_n_buckets - 1)) ++j; \
+ new_bits = j > 2? j : 2; \
+ new_n_buckets = (khint_t)1U << new_bits; \
+ if (h->count > (new_n_buckets>>1) + (new_n_buckets>>2)) return; /* noop, requested size is too small */ \
+ new_used = (khint32_t*)kcalloc(__kh_fsize(new_n_buckets), sizeof(khint32_t)); \
+ n_buckets = h->keys? (khint_t)1U<<h->bits : 0U; \
+ if (n_buckets < new_n_buckets) { /* expand */ \
+ REALLOC_ARRAY(h->keys, new_n_buckets); \
+ } /* otherwise shrink */ \
+ new_mask = new_n_buckets - 1; \
+ for (j = 0; j != n_buckets; ++j) { \
+ khkey_t key; \
+ if (!__kh_used(h->used, j)) continue; \
+ key = h->keys[j]; \
+ __kh_set_unused(h->used, j); \
+ while (1) { /* kick-out process; sort of like in Cuckoo hashing */ \
+ khint_t i; \
+ i = __kh_h2b(__hash_fn(key), new_bits); \
+ while (__kh_used(new_used, i)) i = (i + 1) & new_mask; \
+ __kh_set_used(new_used, i); \
+ if (i < n_buckets && __kh_used(h->used, i)) { /* kick out the existing element */ \
+ { khkey_t tmp = h->keys[i]; h->keys[i] = key; key = tmp; } \
+ __kh_set_unused(h->used, i); /* mark it as deleted in the old hash table */ \
+ } else { /* write the element and jump out of the loop */ \
+ h->keys[i] = key; \
+ break; \
+ } \
+ } \
+ } \
+ if (n_buckets > new_n_buckets) /* shrink the hash table */ \
+ REALLOC_ARRAY(h->keys, new_n_buckets); \
+ kfree(h->used); /* free the working space */ \
+ h->used = new_used, h->bits = new_bits; \
+ }
+
+#define __KHASHL_IMPL_PUT(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ SCOPE khint_t prefix##_putp_core(HType *h, const khkey_t *key, khint_t hash, int *absent) { \
+ khint_t n_buckets, i, last, mask; \
+ n_buckets = h->keys? (khint_t)1U<<h->bits : 0U; \
+ *absent = -1; \
+ if (h->count >= (n_buckets>>1) + (n_buckets>>2)) { /* rehashing */ \
+ prefix##_resize(h, n_buckets + 1U); \
+ n_buckets = (khint_t)1U<<h->bits; \
+ } /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
+ mask = n_buckets - 1; \
+ i = last = __kh_h2b(hash, h->bits); \
+ while (__kh_used(h->used, i) && !__hash_eq(h->keys[i], *key)) { \
+ i = (i + 1U) & mask; \
+ if (i == last) break; \
+ } \
+ if (!__kh_used(h->used, i)) { /* not present at all */ \
+ h->keys[i] = *key; \
+ __kh_set_used(h->used, i); \
+ ++h->count; \
+ *absent = 1; \
+ } else *absent = 0; /* Don't touch h->keys[i] if present */ \
+ return i; \
+ } \
+ SCOPE khint_t prefix##_putp(HType *h, const khkey_t *key, int *absent) { return prefix##_putp_core(h, key, __hash_fn(*key), absent); } \
+ SCOPE khint_t prefix##_put(HType *h, khkey_t key, int *absent) { return prefix##_putp_core(h, &key, __hash_fn(key), absent); }
+
+#define __KHASHL_IMPL_DEL(SCOPE, HType, prefix, khkey_t, __hash_fn) \
+ SCOPE int prefix##_del(HType *h, khint_t i) { \
+ khint_t j = i, k, mask, n_buckets; \
+ if (h->keys == 0) return 0; \
+ n_buckets = (khint_t)1U<<h->bits; \
+ mask = n_buckets - 1U; \
+ while (1) { \
+ j = (j + 1U) & mask; \
+ if (j == i || !__kh_used(h->used, j)) break; /* j==i only when the table is completely full */ \
+ k = __kh_h2b(__hash_fn(h->keys[j]), h->bits); \
+ if ((j > i && (k <= i || k > j)) || (j < i && (k <= i && k > j))) \
+ h->keys[i] = h->keys[j], i = j; \
+ } \
+ __kh_set_unused(h->used, i); \
+ --h->count; \
+ return 1; \
+ }
+
+#define KHASHL_DECLARE(HType, prefix, khkey_t) \
+ __KHASHL_TYPE(HType, khkey_t) \
+ __KHASHL_PROTOTYPES(HType, prefix, khkey_t)
+
+/* compatibility wrappers to make khash -> khashl migration easier */
+#define __KHASH_COMPAT(SCOPE, HType, prefix, khkey_t) \
+ typedef HType HType##_t; \
+ SCOPE HType *kh_init_##prefix(void) { return prefix##_init(); } \
+ SCOPE void kh_release_##prefix(HType *h) { prefix##_release(h); } \
+ SCOPE void kh_destroy_##prefix(HType *h) { prefix##_destroy(h); } \
+ SCOPE void kh_clear_##prefix(HType *h) { prefix##_clear(h); } \
+ SCOPE khint_t kh_get_##prefix(const HType *h, khkey_t key) { \
+ return prefix##_get(h, key); \
+ } \
+ SCOPE void kh_resize_##prefix(HType *h, khint_t new_n_buckets) { \
+ prefix##_resize(h, new_n_buckets); \
+ } \
+ SCOPE khint_t kh_put_##prefix(HType *h, khkey_t key, int *absent) { \
+ return prefix##_put(h, key, absent); \
+ } \
+ SCOPE int kh_del_##prefix(HType *h, khint_t i) { \
+ return prefix##_del(h, i); \
+ }
+
+#define KHASHL_INIT(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ __KHASHL_TYPE(HType, khkey_t) \
+ __KHASHL_IMPL_BASIC(SCOPE, HType, prefix) \
+ __KHASHL_IMPL_GET(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ __KHASHL_IMPL_RESIZE(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ __KHASHL_IMPL_PUT(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ __KHASHL_IMPL_DEL(SCOPE, HType, prefix, khkey_t, __hash_fn)
+
+/***************************
+ * Ensemble of hash tables *
+ ***************************/
+
+typedef struct {
+ khint_t sub, pos;
+} kh_ensitr_t;
+
+#define KHASHE_INIT(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ KHASHL_INIT(KH_LOCAL, HType##_sub, prefix##_sub, khkey_t, __hash_fn, __hash_eq) \
+ typedef struct HType { \
+ khint64_t count:54, bits:8; \
+ HType##_sub *sub; \
+ } HType; \
+ SCOPE HType *prefix##_init(int bits) { \
+ HType *g; \
+ g = (HType*)kcalloc(1, sizeof(*g)); \
+ g->bits = bits; \
+ g->sub = (HType##_sub*)kcalloc(1U<<bits, sizeof(*g->sub)); \
+ return g; \
+ } \
+ SCOPE void prefix##_destroy(HType *g) { \
+ int t; \
+ if (!g) return; \
+ for (t = 0; t < 1<<g->bits; ++t) { kfree((void*)g->sub[t].keys); kfree(g->sub[t].used); } \
+ kfree(g->sub); kfree(g); \
+ } \
+ SCOPE kh_ensitr_t prefix##_getp(const HType *g, const khkey_t *key) { \
+ khint_t hash, low, ret; \
+ kh_ensitr_t r; \
+ HType##_sub *h; \
+ hash = __hash_fn(*key); \
+ low = hash & ((1U<<g->bits) - 1); \
+ h = &g->sub[low]; \
+ ret = prefix##_sub_getp_core(h, key, hash); \
+ if (ret == 1U<<h->bits) r.sub = low, r.pos = (khint_t)-1; \
+ else r.sub = low, r.pos = ret; \
+ return r; \
+ } \
+ SCOPE kh_ensitr_t prefix##_get(const HType *g, const khkey_t key) { return prefix##_getp(g, &key); } \
+ SCOPE kh_ensitr_t prefix##_putp(HType *g, const khkey_t *key, int *absent) { \
+ khint_t hash, low, ret; \
+ kh_ensitr_t r; \
+ HType##_sub *h; \
+ hash = __hash_fn(*key); \
+ low = hash & ((1U<<g->bits) - 1); \
+ h = &g->sub[low]; \
+ ret = prefix##_sub_putp_core(h, key, hash, absent); \
+ if (*absent) ++g->count; \
+ if (ret == 1U<<h->bits) r.sub = low, r.pos = (khint_t)-1; \
+ else r.sub = low, r.pos = ret; \
+ return r; \
+ } \
+ SCOPE kh_ensitr_t prefix##_put(HType *g, const khkey_t key, int *absent) { return prefix##_putp(g, &key, absent); } \
+ SCOPE int prefix##_del(HType *g, kh_ensitr_t itr) { \
+ HType##_sub *h = &g->sub[itr.sub]; \
+ int ret; \
+ ret = prefix##_sub_del(h, itr.pos); \
+ if (ret) --g->count; \
+ return ret; \
+ }
+
+/*****************************
+ * More convenient interface *
+ *****************************/
+
+#define __kh_packed /* noop, we use -Werror=address-of-packed-member */
+#define __kh_cached_hash(x) ((x).hash)
+
+#define KHASHL_SET_INIT(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ typedef struct { khkey_t key; } __kh_packed HType##_s_bucket_t; \
+ static kh_inline khint_t prefix##_s_hash(HType##_s_bucket_t x) { return __hash_fn(x.key); } \
+ static kh_inline int prefix##_s_eq(HType##_s_bucket_t x, HType##_s_bucket_t y) { return __hash_eq(x.key, y.key); } \
+ KHASHL_INIT(KH_LOCAL, HType, prefix##_s, HType##_s_bucket_t, prefix##_s_hash, prefix##_s_eq) \
+ SCOPE HType *prefix##_init(void) { return prefix##_s_init(); } \
+ SCOPE void prefix##_release(HType *h) { prefix##_s_release(h); } \
+ SCOPE void prefix##_destroy(HType *h) { prefix##_s_destroy(h); } \
+ SCOPE void prefix##_clear(HType *h) { prefix##_s_clear(h); } \
+ SCOPE void prefix##_resize(HType *h, khint_t new_n_buckets) { prefix##_s_resize(h, new_n_buckets); } \
+ SCOPE khint_t prefix##_get(const HType *h, khkey_t key) { HType##_s_bucket_t t; t.key = key; return prefix##_s_getp(h, &t); } \
+ SCOPE int prefix##_del(HType *h, khint_t k) { return prefix##_s_del(h, k); } \
+ SCOPE khint_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_s_bucket_t t; t.key = key; return prefix##_s_putp(h, &t, absent); } \
+ __KHASH_COMPAT(SCOPE, HType, prefix, khkey_t)
+
+#define KHASHL_MAP_INIT(SCOPE, HType, prefix, khkey_t, kh_val_t, __hash_fn, __hash_eq) \
+ typedef struct { khkey_t key; kh_val_t val; } __kh_packed HType##_m_bucket_t; \
+ static kh_inline khint_t prefix##_m_hash(HType##_m_bucket_t x) { return __hash_fn(x.key); } \
+ static kh_inline int prefix##_m_eq(HType##_m_bucket_t x, HType##_m_bucket_t y) { return __hash_eq(x.key, y.key); } \
+ KHASHL_INIT(KH_LOCAL, HType, prefix##_m, HType##_m_bucket_t, prefix##_m_hash, prefix##_m_eq) \
+ SCOPE HType *prefix##_init(void) { return prefix##_m_init(); } \
+ SCOPE void prefix##_release(HType *h) { prefix##_m_release(h); } \
+ SCOPE void prefix##_destroy(HType *h) { prefix##_m_destroy(h); } \
+ SCOPE void prefix##_clear(HType *h) { prefix##_m_clear(h); } \
+ SCOPE void prefix##_resize(HType *h, khint_t new_n_buckets) { prefix##_m_resize(h, new_n_buckets); } \
+ SCOPE khint_t prefix##_get(const HType *h, khkey_t key) { HType##_m_bucket_t t; t.key = key; return prefix##_m_getp(h, &t); } \
+ SCOPE int prefix##_del(HType *h, khint_t k) { return prefix##_m_del(h, k); } \
+ SCOPE khint_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_m_bucket_t t; t.key = key; return prefix##_m_putp(h, &t, absent); } \
+ __KHASH_COMPAT(SCOPE, HType, prefix, khkey_t)
+
+#define KHASHL_CSET_INIT(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ typedef struct { khkey_t key; khint_t hash; } __kh_packed HType##_cs_bucket_t; \
+ static kh_inline int prefix##_cs_eq(HType##_cs_bucket_t x, HType##_cs_bucket_t y) { return x.hash == y.hash && __hash_eq(x.key, y.key); } \
+ KHASHL_INIT(KH_LOCAL, HType, prefix##_cs, HType##_cs_bucket_t, __kh_cached_hash, prefix##_cs_eq) \
+ SCOPE HType *prefix##_init(void) { return prefix##_cs_init(); } \
+ SCOPE void prefix##_destroy(HType *h) { prefix##_cs_destroy(h); } \
+ SCOPE khint_t prefix##_get(const HType *h, khkey_t key) { HType##_cs_bucket_t t; t.key = key; t.hash = __hash_fn(key); return prefix##_cs_getp(h, &t); } \
+ SCOPE int prefix##_del(HType *h, khint_t k) { return prefix##_cs_del(h, k); } \
+ SCOPE khint_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_cs_bucket_t t; t.key = key, t.hash = __hash_fn(key); return prefix##_cs_putp(h, &t, absent); }
+
+#define KHASHL_CMAP_INIT(SCOPE, HType, prefix, khkey_t, kh_val_t, __hash_fn, __hash_eq) \
+ typedef struct { khkey_t key; kh_val_t val; khint_t hash; } __kh_packed HType##_cm_bucket_t; \
+ static kh_inline int prefix##_cm_eq(HType##_cm_bucket_t x, HType##_cm_bucket_t y) { return x.hash == y.hash && __hash_eq(x.key, y.key); } \
+ KHASHL_INIT(KH_LOCAL, HType, prefix##_cm, HType##_cm_bucket_t, __kh_cached_hash, prefix##_cm_eq) \
+ SCOPE HType *prefix##_init(void) { return prefix##_cm_init(); } \
+ SCOPE void prefix##_destroy(HType *h) { prefix##_cm_destroy(h); } \
+ SCOPE khint_t prefix##_get(const HType *h, khkey_t key) { HType##_cm_bucket_t t; t.key = key; t.hash = __hash_fn(key); return prefix##_cm_getp(h, &t); } \
+ SCOPE int prefix##_del(HType *h, khint_t k) { return prefix##_cm_del(h, k); } \
+ SCOPE khint_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_cm_bucket_t t; t.key = key, t.hash = __hash_fn(key); return prefix##_cm_putp(h, &t, absent); }
+
+#define KHASHE_MAP_INIT(SCOPE, HType, prefix, khkey_t, kh_val_t, __hash_fn, __hash_eq) \
+ typedef struct { khkey_t key; kh_val_t val; } __kh_packed HType##_m_bucket_t; \
+ static kh_inline khint_t prefix##_m_hash(HType##_m_bucket_t x) { return __hash_fn(x.key); } \
+ static kh_inline int prefix##_m_eq(HType##_m_bucket_t x, HType##_m_bucket_t y) { return __hash_eq(x.key, y.key); } \
+ KHASHE_INIT(KH_LOCAL, HType, prefix##_m, HType##_m_bucket_t, prefix##_m_hash, prefix##_m_eq) \
+ SCOPE HType *prefix##_init(int bits) { return prefix##_m_init(bits); } \
+ SCOPE void prefix##_destroy(HType *h) { prefix##_m_destroy(h); } \
+ SCOPE kh_ensitr_t prefix##_get(const HType *h, khkey_t key) { HType##_m_bucket_t t; t.key = key; return prefix##_m_getp(h, &t); } \
+ SCOPE int prefix##_del(HType *h, kh_ensitr_t k) { return prefix##_m_del(h, k); } \
+ SCOPE kh_ensitr_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_m_bucket_t t; t.key = key; return prefix##_m_putp(h, &t, absent); }
+
+/**************************
+ * Public macro functions *
+ **************************/
+
+#define kh_bucket(h, x) ((h)->keys[x])
+
+/*! @function
+ @abstract Get the number of elements in the hash table
+ @param h Pointer to the hash table
+ @return Number of elements in the hash table [khint_t]
+ */
+#define kh_size(h) ((h)->count)
+
+#define kh_capacity(h) ((h)->keys? 1U<<(h)->bits : 0U)
+
+/*! @function
+ @abstract Get the end iterator
+ @param h Pointer to the hash table
+ @return The end iterator [khint_t]
+ */
+#define kh_end(h) kh_capacity(h)
+
+/*! @function
+ @abstract Get key given an iterator
+ @param h Pointer to the hash table
+ @param x Iterator to the bucket [khint_t]
+ @return Key [type of keys]
+ */
+#define kh_key(h, x) ((h)->keys[x].key)
+
+/*! @function
+ @abstract Get value given an iterator
+ @param h Pointer to the hash table
+ @param x Iterator to the bucket [khint_t]
+ @return Value [type of values]
+ @discussion For hash sets, calling this results in segfault.
+ */
+#define kh_val(h, x) ((h)->keys[x].val)
+
+/*! @function
+ @abstract Alias of kh_val()
+ */
+#define kh_value(h, x) kh_val(h, x)
+
+/*! @function
+ @abstract Test whether a bucket contains data.
+ @param h Pointer to the hash table
+ @param x Iterator to the bucket [khint_t]
+ @return 1 if containing data; 0 otherwise [int]
+ */
+#define kh_exist(h, x) __kh_used((h)->used, (x))
+
+#define kh_ens_key(g, x) kh_key(&(g)->sub[(x).sub], (x).pos)
+#define kh_ens_val(g, x) kh_val(&(g)->sub[(x).sub], (x).pos)
+#define kh_ens_exist(g, x) kh_exist(&(g)->sub[(x).sub], (x).pos)
+#define kh_ens_is_end(x) ((x).pos == (khint_t)-1)
+#define kh_ens_size(g) ((g)->count)
+
+/**************************************
+ * Common hash and equality functions *
+ **************************************/
+
+#define kh_eq_generic(a, b) ((a) == (b))
+#define kh_eq_str(a, b) (strcmp((a), (b)) == 0)
+#define kh_hash_dummy(x) ((khint_t)(x))
+
+static kh_inline khint_t kh_hash_uint32(khint_t key) {
+ key += ~(key << 15);
+ key ^= (key >> 10);
+ key += (key << 3);
+ key ^= (key >> 6);
+ key += ~(key << 11);
+ key ^= (key >> 16);
+ return key;
+}
+
+static kh_inline khint_t kh_hash_uint64(khint64_t key) {
+ key = ~key + (key << 21);
+ key = key ^ key >> 24;
+ key = (key + (key << 3)) + (key << 8);
+ key = key ^ key >> 14;
+ key = (key + (key << 2)) + (key << 4);
+ key = key ^ key >> 28;
+ key = key + (key << 31);
+ return (khint_t)key;
+}
+
+#define KH_FNV_SEED 11
+
+static kh_inline khint_t kh_hash_str(const char *s) { /* FNV1a */
+ khint_t h = KH_FNV_SEED ^ 2166136261U;
+ const unsigned char *t = (const unsigned char*)s;
+ for (; *t; ++t)
+ h ^= *t, h *= 16777619;
+ return h;
+}
+
+static kh_inline khint_t kh_hash_bytes(int len, const unsigned char *s) {
+ khint_t h = KH_FNV_SEED ^ 2166136261U;
+ int i;
+ for (i = 0; i < len; ++i)
+ h ^= s[i], h *= 16777619;
+ return h;
+}
+
+/*! @function
+ @abstract Get the start iterator
+ @param h Pointer to the hash table
+ @return The start iterator [khint_t]
+ */
+#define kh_begin(h) (khint_t)(0)
+
+/*! @function
+ @abstract Iterate over the entries in the hash table
+ @param h Pointer to the hash table
+ @param kvar Variable to which key will be assigned
+ @param vvar Variable to which value will be assigned
+ @param code Block of code to execute
+ */
+#define kh_foreach(h, kvar, vvar, code) { khint_t __i; \
+ for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \
+ if (!kh_exist(h,__i)) continue; \
+ (kvar) = kh_key(h,__i); \
+ (vvar) = kh_val(h,__i); \
+ code; \
+ } }
+
+/*! @function
+ @abstract Iterate over the values in the hash table
+ @param h Pointer to the hash table
+ @param vvar Variable to which value will be assigned
+ @param code Block of code to execute
+ */
+#define kh_foreach_value(h, vvar, code) { khint_t __i; \
+ for (__i = kh_begin(h); __i != kh_end(h); ++__i) { \
+ if (!kh_exist(h,__i)) continue; \
+ (vvar) = kh_val(h,__i); \
+ code; \
+ } }
+
+static inline unsigned int oidhash_by_value(struct object_id oid)
+{
+ return oidhash(&oid);
+}
+
+static inline int oideq_by_value(struct object_id a, struct object_id b)
+{
+ return oideq(&a, &b);
+}
+
+KHASHL_SET_INIT(KH_LOCAL, kh_oid_set, oid_set, struct object_id,
+ oidhash_by_value, oideq_by_value)
+
+KHASHL_MAP_INIT(KH_LOCAL, kh_oid_map, oid_map, struct object_id, void *,
+ oidhash_by_value, oideq_by_value)
+
+KHASHL_MAP_INIT(KH_LOCAL, kh_oid_pos, oid_pos, struct object_id, int,
+ oidhash_by_value, oideq_by_value)
+
+#endif /* __AC_KHASHL_H */
diff --git a/object-store-ll.h b/object-store-ll.h
index 26a3895c82..401c4beff5 100644
--- a/object-store-ll.h
+++ b/object-store-ll.h
@@ -160,7 +160,7 @@ struct raw_object_store {
*/
struct object_directory *odb;
struct object_directory **odb_tail;
- struct kh_odb_path_map *odb_by_path;
+ struct odb_path_map *odb_by_path;
int loaded_alternates;
diff --git a/object-store.h b/object-store.h
index 1b3e3d7d01..3db4802e86 100644
--- a/object-store.h
+++ b/object-store.h
@@ -1,11 +1,12 @@
#ifndef OBJECT_STORE_H
#define OBJECT_STORE_H
-#include "khash.h"
+#include "khashl.h"
#include "dir.h"
#include "object-store-ll.h"
-KHASH_INIT(odb_path_map, const char * /* key: odb_path */,
- struct object_directory *, 1, fspathhash, fspatheq)
+KHASHL_MAP_INIT(KH_LOCAL, odb_path_map, odb_path_map,
+ const char * /* key: odb_path */, struct object_directory *,
+ fspathhash, fspatheq)
#endif /* OBJECT_STORE_H */
diff --git a/oidset.h b/oidset.h
index 262f4256d6..17af1b6708 100644
--- a/oidset.h
+++ b/oidset.h
@@ -1,7 +1,7 @@
#ifndef OIDSET_H
#define OIDSET_H
-#include "khash.h"
+#include "khashl.h"
/**
* This API is similar to oid-array, in that it maintains a set of object ids
diff --git a/pack-bitmap.h b/pack-bitmap.h
index c7dea13217..d018365f24 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -2,7 +2,7 @@
#define PACK_BITMAP_H
#include "ewah/ewok.h"
-#include "khash.h"
+#include "khashl.h"
#include "pack.h"
#include "pack-objects.h"
#include "string-list.h"
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/3] khashl: fix ensemble lookups on empty table
2024-03-25 23:07 [PATCH 0/3] switch to tombstone-free khashl table Eric Wong
2024-03-25 23:07 ` [PATCH 1/3] list-objects-filter: use kh_size API Eric Wong
2024-03-25 23:07 ` [PATCH 2/3] treewide: switch to khashl for memory savings Eric Wong
@ 2024-03-25 23:07 ` Eric Wong
2024-03-25 23:07 ` [REJECT 4/3] switch to khashl ensemble Eric Wong
2024-03-26 17:40 ` [PATCH 0/3] switch to tombstone-free khashl table Junio C Hamano
4 siblings, 0 replies; 14+ messages in thread
From: Eric Wong @ 2024-03-25 23:07 UTC (permalink / raw)
To: git
The ->bits field of regular khashl structs is invalid when
the ->keys array is NULL. Thus the ensemble *_getp implementation
must follow existing *_get and *_getp usage conventions and
check the iterator against kh_end().
This fixes a fast-import crash on t3427-rebase-subtree.sh in an
abandoned commit to use the ensemble implementation for oid_map
and oid_pos. I've abandoned the aforementioned commit for now
since it was more intrusive, more expensive for small tables,
and realloc(3) on glibc is already optimized using mremap(2) for
large hash resizes.
Signed-off-by: Eric Wong <e@80x24.org>
---
khashl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/khashl.h b/khashl.h
index 3660fd2ce4..8ffe80fbb2 100644
--- a/khashl.h
+++ b/khashl.h
@@ -265,7 +265,7 @@ typedef struct {
low = hash & ((1U<<g->bits) - 1); \
h = &g->sub[low]; \
ret = prefix##_sub_getp_core(h, key, hash); \
- if (ret == 1U<<h->bits) r.sub = low, r.pos = (khint_t)-1; \
+ if (ret >= kh_end(h)) r.sub = low, r.pos = (khint_t)-1; \
else r.sub = low, r.pos = ret; \
return r; \
} \
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [REJECT 4/3] switch to khashl ensemble
2024-03-25 23:07 [PATCH 0/3] switch to tombstone-free khashl table Eric Wong
` (2 preceding siblings ...)
2024-03-25 23:07 ` [PATCH 3/3] khashl: fix ensemble lookups on empty table Eric Wong
@ 2024-03-25 23:07 ` Eric Wong
2024-03-26 17:40 ` [PATCH 0/3] switch to tombstone-free khashl table Junio C Hamano
4 siblings, 0 replies; 14+ messages in thread
From: Eric Wong @ 2024-03-25 23:07 UTC (permalink / raw)
To: git
Using an ensemble of hash tables to implement a larger one can
reduce the temporary space required to resize a hash table.
However, I haven't been able to measure an improvement using
glibc memusage(1), yet.
I could be tuning it wrong (too few or too many sub hash
tables), and it may not be useful with glibc malloc since large
realloc(3) are optimized with mremap(2) to provide in-place
growth.
---
builtin/fast-import.c | 10 ++++----
builtin/replay.c | 10 ++++----
delta-islands.c | 54 +++++++++++++++++++-------------------
fsck.c | 10 ++++----
khashl.h | 60 ++++++++++++++++++++++++++++++++-----------
pack-bitmap-write.c | 4 +--
pack-bitmap.c | 32 +++++++++++------------
7 files changed, 105 insertions(+), 75 deletions(-)
diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 29e50fd675..190e136e2e 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -2198,7 +2198,7 @@ static uintmax_t change_note_fanout(struct tree_entry *root,
static int parse_mapped_oid_hex(const char *hex, struct object_id *oid, const char **end)
{
int algo;
- khiter_t it;
+ kh_ensitr_t it;
/* Make SHA-1 object IDs have all-zero padding. */
memset(oid->hash, 0, sizeof(oid->hash));
@@ -2209,13 +2209,13 @@ static int parse_mapped_oid_hex(const char *hex, struct object_id *oid, const ch
it = kh_get_oid_map(sub_oid_map, *oid);
/* No such object? */
- if (it == kh_end(sub_oid_map)) {
+ if (kh_ens_is_end(it)) {
/* If we're using the same algorithm, pass it through. */
if (hash_algos[algo].format_id == the_hash_algo->format_id)
return 0;
return -1;
}
- oidcpy(oid, kh_value(sub_oid_map, it));
+ oidcpy(oid, kh_ens_val(sub_oid_map, it));
return 0;
}
@@ -3083,13 +3083,13 @@ static void insert_mapped_mark(uintmax_t mark, void *object, void *cbp)
struct object_id *fromoid = object;
struct object_id *tooid = find_mark(cbp, mark);
int ret;
- khiter_t it;
+ kh_ensitr_t it;
it = kh_put_oid_map(sub_oid_map, *fromoid, &ret);
/* We've already seen this object. */
if (ret == 0)
return;
- kh_value(sub_oid_map, it) = tooid;
+ kh_ens_val(sub_oid_map, it) = tooid;
}
static void build_mark_map_one(struct mark_set *from, struct mark_set *to)
diff --git a/builtin/replay.c b/builtin/replay.c
index 6bc4b47f09..e084da8a94 100644
--- a/builtin/replay.c
+++ b/builtin/replay.c
@@ -227,10 +227,10 @@ static struct commit *mapped_commit(kh_oid_map_t *replayed_commits,
struct commit *commit,
struct commit *fallback)
{
- khint_t pos = kh_get_oid_map(replayed_commits, commit->object.oid);
- if (pos == kh_end(replayed_commits))
+ kh_ensitr_t pos = kh_get_oid_map(replayed_commits, commit->object.oid);
+ if (kh_ens_is_end(pos))
return fallback;
- return kh_value(replayed_commits, pos);
+ return kh_ens_val(replayed_commits, pos);
}
static struct commit *pick_regular_commit(struct commit *pickme,
@@ -381,7 +381,7 @@ int cmd_replay(int argc, const char **argv, const char *prefix)
replayed_commits = kh_init_oid_map();
while ((commit = get_revision(&revs))) {
const struct name_decoration *decoration;
- khint_t pos;
+ kh_ensitr_t pos;
int hr;
if (!commit->parents)
@@ -399,7 +399,7 @@ int cmd_replay(int argc, const char **argv, const char *prefix)
if (hr == 0)
BUG("Duplicate rewritten commit: %s\n",
oid_to_hex(&commit->object.oid));
- kh_value(replayed_commits, pos) = last_commit;
+ kh_ens_val(replayed_commits, pos) = last_commit;
/* Update any necessary branches */
if (advance_name)
diff --git a/delta-islands.c b/delta-islands.c
index aa35839f15..de159e98a8 100644
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -90,7 +90,7 @@ static int island_bitmap_get(struct island_bitmap *self, uint32_t i)
int in_same_island(const struct object_id *trg_oid, const struct object_id *src_oid)
{
- khiter_t trg_pos, src_pos;
+ kh_ensitr_t trg_pos, src_pos;
/* If we aren't using islands, assume everything goes together. */
if (!island_marks)
@@ -101,7 +101,7 @@ int in_same_island(const struct object_id *trg_oid, const struct object_id *src_
* against anything -- it's not an important object
*/
trg_pos = kh_get_oid_map(island_marks, *trg_oid);
- if (trg_pos >= kh_end(island_marks))
+ if (kh_ens_is_end(trg_pos))
return 1;
/*
@@ -109,28 +109,28 @@ int in_same_island(const struct object_id *trg_oid, const struct object_id *src_
* we don't want to base any deltas on it!
*/
src_pos = kh_get_oid_map(island_marks, *src_oid);
- if (src_pos >= kh_end(island_marks))
+ if (kh_ens_is_end(src_pos))
return 0;
- return island_bitmap_is_subset(kh_value(island_marks, trg_pos),
- kh_value(island_marks, src_pos));
+ return island_bitmap_is_subset(kh_ens_val(island_marks, trg_pos),
+ kh_ens_val(island_marks, src_pos));
}
int island_delta_cmp(const struct object_id *a, const struct object_id *b)
{
- khiter_t a_pos, b_pos;
+ kh_ensitr_t a_pos, b_pos;
struct island_bitmap *a_bitmap = NULL, *b_bitmap = NULL;
if (!island_marks)
return 0;
a_pos = kh_get_oid_map(island_marks, *a);
- if (a_pos < kh_end(island_marks))
- a_bitmap = kh_value(island_marks, a_pos);
+ if (!kh_ens_is_end(a_pos))
+ a_bitmap = kh_ens_val(island_marks, a_pos);
b_pos = kh_get_oid_map(island_marks, *b);
- if (b_pos < kh_end(island_marks))
- b_bitmap = kh_value(island_marks, b_pos);
+ if (!kh_ens_is_end(b_pos))
+ b_bitmap = kh_ens_val(island_marks, b_pos);
if (a_bitmap) {
if (!b_bitmap || !island_bitmap_is_subset(a_bitmap, b_bitmap))
@@ -146,20 +146,20 @@ int island_delta_cmp(const struct object_id *a, const struct object_id *b)
static struct island_bitmap *create_or_get_island_marks(struct object *obj)
{
- khiter_t pos;
+ kh_ensitr_t pos;
int hash_ret;
pos = kh_put_oid_map(island_marks, obj->oid, &hash_ret);
if (hash_ret)
- kh_value(island_marks, pos) = island_bitmap_new(NULL);
+ kh_ens_val(island_marks, pos) = island_bitmap_new(NULL);
- return kh_value(island_marks, pos);
+ return kh_ens_val(island_marks, pos);
}
static void set_island_marks(struct object *obj, struct island_bitmap *marks)
{
struct island_bitmap *b;
- khiter_t pos;
+ kh_ensitr_t pos;
int hash_ret;
pos = kh_put_oid_map(island_marks, obj->oid, &hash_ret);
@@ -169,7 +169,7 @@ static void set_island_marks(struct object *obj, struct island_bitmap *marks)
* parent.
*/
marks->refcount++;
- kh_value(island_marks, pos) = marks;
+ kh_ens_val(island_marks, pos) = marks;
return;
}
@@ -177,10 +177,10 @@ static void set_island_marks(struct object *obj, struct island_bitmap *marks)
* We do have it. Make sure we split any copy-on-write before
* updating.
*/
- b = kh_value(island_marks, pos);
+ b = kh_ens_val(island_marks, pos);
if (b->refcount > 1) {
b->refcount--;
- b = kh_value(island_marks, pos) = island_bitmap_new(b);
+ b = kh_ens_val(island_marks, pos) = island_bitmap_new(b);
}
island_bitmap_or(b, marks);
}
@@ -272,13 +272,13 @@ void resolve_tree_islands(struct repository *r,
struct tree *tree;
struct tree_desc desc;
struct name_entry entry;
- khiter_t pos;
+ kh_ensitr_t pos;
pos = kh_get_oid_map(island_marks, ent->idx.oid);
- if (pos >= kh_end(island_marks))
+ if (kh_ens_is_end(pos))
continue;
- root_marks = kh_value(island_marks, pos);
+ root_marks = kh_ens_val(island_marks, pos);
tree = lookup_tree(r, &ent->idx.oid);
if (!tree || parse_tree(tree) < 0)
@@ -499,11 +499,11 @@ void load_delta_islands(struct repository *r, int progress)
void propagate_island_marks(struct commit *commit)
{
- khiter_t pos = kh_get_oid_map(island_marks, commit->object.oid);
+ kh_ensitr_t pos = kh_get_oid_map(island_marks, commit->object.oid);
- if (pos < kh_end(island_marks)) {
+ if (!kh_ens_is_end(pos)) {
struct commit_list *p;
- struct island_bitmap *root_marks = kh_value(island_marks, pos);
+ struct island_bitmap *root_marks = kh_ens_val(island_marks, pos);
repo_parse_commit(the_repository, commit);
set_island_marks(&repo_get_commit_tree(the_repository, commit)->object,
@@ -518,7 +518,7 @@ void free_island_marks(void)
struct island_bitmap *bitmap;
if (island_marks) {
- kh_foreach_value(island_marks, bitmap, {
+ kh_ens_foreach_value(island_marks, bitmap, {
if (!--bitmap->refcount)
free(bitmap);
});
@@ -538,12 +538,12 @@ int compute_pack_layers(struct packing_data *to_pack)
for (i = 0; i < to_pack->nr_objects; ++i) {
struct object_entry *entry = &to_pack->objects[i];
- khiter_t pos = kh_get_oid_map(island_marks, entry->idx.oid);
+ kh_ensitr_t pos = kh_get_oid_map(island_marks, entry->idx.oid);
oe_set_layer(to_pack, entry, 1);
- if (pos < kh_end(island_marks)) {
- struct island_bitmap *bitmap = kh_value(island_marks, pos);
+ if (!kh_ens_is_end(pos)) {
+ struct island_bitmap *bitmap = kh_ens_val(island_marks, pos);
if (island_bitmap_get(bitmap, island_counter_core))
oe_set_layer(to_pack, entry, 0);
diff --git a/fsck.c b/fsck.c
index 8ded0a473a..4c67e1e64c 100644
--- a/fsck.c
+++ b/fsck.c
@@ -266,13 +266,13 @@ void fsck_enable_object_names(struct fsck_options *options)
const char *fsck_get_object_name(struct fsck_options *options,
const struct object_id *oid)
{
- khiter_t pos;
+ kh_ensitr_t pos;
if (!options->object_names)
return NULL;
pos = kh_get_oid_map(options->object_names, *oid);
- if (pos >= kh_end(options->object_names))
+ if (kh_ens_is_end(pos))
return NULL;
- return kh_value(options->object_names, pos);
+ return kh_ens_val(options->object_names, pos);
}
void fsck_put_object_name(struct fsck_options *options,
@@ -281,7 +281,7 @@ void fsck_put_object_name(struct fsck_options *options,
{
va_list ap;
struct strbuf buf = STRBUF_INIT;
- khiter_t pos;
+ kh_ensitr_t pos;
int hashret;
if (!options->object_names)
@@ -292,7 +292,7 @@ void fsck_put_object_name(struct fsck_options *options,
return;
va_start(ap, fmt);
strbuf_vaddf(&buf, fmt, ap);
- kh_value(options->object_names, pos) = strbuf_detach(&buf, NULL);
+ kh_ens_val(options->object_names, pos) = strbuf_detach(&buf, NULL);
va_end(ap);
}
diff --git a/khashl.h b/khashl.h
index 8ffe80fbb2..e950593d61 100644
--- a/khashl.h
+++ b/khashl.h
@@ -203,22 +203,22 @@ static kh_inline khint_t __kh_h2b(khint_t hash, khint_t bits) { return hash * 26
__KHASHL_PROTOTYPES(HType, prefix, khkey_t)
/* compatibility wrappers to make khash -> khashl migration easier */
-#define __KHASH_COMPAT(SCOPE, HType, prefix, khkey_t) \
+#define __KHASH_COMPAT(SCOPE, kh_idx, HType, prefix, khkey_t) \
typedef HType HType##_t; \
SCOPE HType *kh_init_##prefix(void) { return prefix##_init(); } \
SCOPE void kh_release_##prefix(HType *h) { prefix##_release(h); } \
SCOPE void kh_destroy_##prefix(HType *h) { prefix##_destroy(h); } \
SCOPE void kh_clear_##prefix(HType *h) { prefix##_clear(h); } \
- SCOPE khint_t kh_get_##prefix(const HType *h, khkey_t key) { \
+ SCOPE kh_idx kh_get_##prefix(const HType *h, khkey_t key) { \
return prefix##_get(h, key); \
} \
SCOPE void kh_resize_##prefix(HType *h, khint_t new_n_buckets) { \
prefix##_resize(h, new_n_buckets); \
} \
- SCOPE khint_t kh_put_##prefix(HType *h, khkey_t key, int *absent) { \
+ SCOPE kh_idx kh_put_##prefix(HType *h, khkey_t key, int *absent) { \
return prefix##_put(h, key, absent); \
} \
- SCOPE int kh_del_##prefix(HType *h, khint_t i) { \
+ SCOPE int kh_del_##prefix(HType *h, kh_idx i) { \
return prefix##_del(h, i); \
}
@@ -244,18 +244,32 @@ typedef struct {
khint64_t count:54, bits:8; \
HType##_sub *sub; \
} HType; \
- SCOPE HType *prefix##_init(int bits) { \
- HType *g; \
- g = (HType*)kcalloc(1, sizeof(*g)); \
+ SCOPE HType *prefix##_init_bits(HType *g, size_t bits) { \
g->bits = bits; \
g->sub = (HType##_sub*)kcalloc(1U<<bits, sizeof(*g->sub)); \
return g; \
} \
+ SCOPE HType *prefix##_init(void) { \
+ HType *g; \
+ g = (HType*)kcalloc(1, sizeof(*g)); \
+ return prefix##_init_bits(g, 6); /* unsure about default */ \
+ } \
+ SCOPE void prefix##_release(HType *g) { \
+ int t; \
+ for (t = 0; t < 1<<g->bits; ++t) \
+ prefix##_sub_release(&g->sub[t]); \
+ kfree(g->sub); \
+ } \
SCOPE void prefix##_destroy(HType *g) { \
+ if (!g) return; \
+ prefix##_release(g); \
+ kfree(g); \
+ } \
+ SCOPE void prefix##_clear(HType *g) { \
int t; \
if (!g) return; \
- for (t = 0; t < 1<<g->bits; ++t) { kfree((void*)g->sub[t].keys); kfree(g->sub[t].used); } \
- kfree(g->sub); kfree(g); \
+ for (t = 0; t < 1<<g->bits; ++t) \
+ prefix##_sub_clear(&g->sub[t]); \
} \
SCOPE kh_ensitr_t prefix##_getp(const HType *g, const khkey_t *key) { \
khint_t hash, low, ret; \
@@ -312,7 +326,7 @@ typedef struct {
SCOPE khint_t prefix##_get(const HType *h, khkey_t key) { HType##_s_bucket_t t; t.key = key; return prefix##_s_getp(h, &t); } \
SCOPE int prefix##_del(HType *h, khint_t k) { return prefix##_s_del(h, k); } \
SCOPE khint_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_s_bucket_t t; t.key = key; return prefix##_s_putp(h, &t, absent); } \
- __KHASH_COMPAT(SCOPE, HType, prefix, khkey_t)
+ __KHASH_COMPAT(SCOPE, khint_t, HType, prefix, khkey_t)
#define KHASHL_MAP_INIT(SCOPE, HType, prefix, khkey_t, kh_val_t, __hash_fn, __hash_eq) \
typedef struct { khkey_t key; kh_val_t val; } __kh_packed HType##_m_bucket_t; \
@@ -327,7 +341,7 @@ typedef struct {
SCOPE khint_t prefix##_get(const HType *h, khkey_t key) { HType##_m_bucket_t t; t.key = key; return prefix##_m_getp(h, &t); } \
SCOPE int prefix##_del(HType *h, khint_t k) { return prefix##_m_del(h, k); } \
SCOPE khint_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_m_bucket_t t; t.key = key; return prefix##_m_putp(h, &t, absent); } \
- __KHASH_COMPAT(SCOPE, HType, prefix, khkey_t)
+ __KHASH_COMPAT(SCOPE, khint_t, HType, prefix, khkey_t)
#define KHASHL_CSET_INIT(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
typedef struct { khkey_t key; khint_t hash; } __kh_packed HType##_cs_bucket_t; \
@@ -354,11 +368,15 @@ typedef struct {
static kh_inline khint_t prefix##_m_hash(HType##_m_bucket_t x) { return __hash_fn(x.key); } \
static kh_inline int prefix##_m_eq(HType##_m_bucket_t x, HType##_m_bucket_t y) { return __hash_eq(x.key, y.key); } \
KHASHE_INIT(KH_LOCAL, HType, prefix##_m, HType##_m_bucket_t, prefix##_m_hash, prefix##_m_eq) \
- SCOPE HType *prefix##_init(int bits) { return prefix##_m_init(bits); } \
+ SCOPE HType *prefix##_init(void) { return prefix##_m_init(); } \
+ SCOPE void prefix##_release(HType *h) { prefix##_m_release(h); } \
SCOPE void prefix##_destroy(HType *h) { prefix##_m_destroy(h); } \
+ SCOPE void prefix##_clear(HType *h) { prefix##_m_clear(h); } \
+ SCOPE void prefix##_resize(HType *h, khint_t ignore) { /* noop */ } \
SCOPE kh_ensitr_t prefix##_get(const HType *h, khkey_t key) { HType##_m_bucket_t t; t.key = key; return prefix##_m_getp(h, &t); } \
SCOPE int prefix##_del(HType *h, kh_ensitr_t k) { return prefix##_m_del(h, k); } \
- SCOPE kh_ensitr_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_m_bucket_t t; t.key = key; return prefix##_m_putp(h, &t, absent); }
+ SCOPE kh_ensitr_t prefix##_put(HType *h, khkey_t key, int *absent) { HType##_m_bucket_t t; t.key = key; return prefix##_m_putp(h, &t, absent); } \
+ __KHASH_COMPAT(SCOPE, kh_ensitr_t, HType, prefix, khkey_t)
/**************************
* Public macro functions *
@@ -487,6 +505,18 @@ static kh_inline khint_t kh_hash_bytes(int len, const unsigned char *s) {
code; \
} }
+#define kh_ens_foreach(g, kvar, vvar, code) do { \
+ size_t t; \
+ for (t = 0; t < 1<<g->bits; ++t) \
+ kh_foreach(&g->sub[t], kvar, vvar, code); \
+} while (0)
+
+#define kh_ens_foreach_value(g, vvar, code) do { \
+ size_t t; \
+ for (t = 0; t < 1<<g->bits; ++t) \
+ kh_foreach_value(&g->sub[t], vvar, code); \
+} while (0)
+
/*! @function
@abstract Iterate over the values in the hash table
@param h Pointer to the hash table
@@ -513,10 +543,10 @@ static inline int oideq_by_value(struct object_id a, struct object_id b)
KHASHL_SET_INIT(KH_LOCAL, kh_oid_set, oid_set, struct object_id,
oidhash_by_value, oideq_by_value)
-KHASHL_MAP_INIT(KH_LOCAL, kh_oid_map, oid_map, struct object_id, void *,
+KHASHE_MAP_INIT(KH_LOCAL, kh_oid_map, oid_map, struct object_id, void *,
oidhash_by_value, oideq_by_value)
-KHASHL_MAP_INIT(KH_LOCAL, kh_oid_pos, oid_pos, struct object_id, int,
+KHASHE_MAP_INIT(KH_LOCAL, kh_oid_pos, oid_pos, struct object_id, int,
oidhash_by_value, oideq_by_value)
#endif /* __AC_KHASHL_H */
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 990a9498d7..bbf2090c46 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -465,7 +465,7 @@ static int fill_bitmap_commit(struct bb_commit *ent,
static void store_selected(struct bb_commit *ent, struct commit *commit)
{
struct bitmapped_commit *stored = &writer.selected[ent->idx];
- khiter_t hash_pos;
+ kh_ensitr_t hash_pos;
int hash_ret;
stored->bitmap = bitmap_to_ewah(ent->bitmap);
@@ -474,7 +474,7 @@ static void store_selected(struct bb_commit *ent, struct commit *commit)
if (hash_ret == 0)
die("Duplicate entry when writing index: %s",
oid_to_hex(&commit->object.oid));
- kh_value(writer.bitmaps, hash_pos) = stored;
+ kh_ens_val(writer.bitmaps, hash_pos) = stored;
}
int bitmap_writer_build(struct packing_data *to_pack)
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 2baeabacee..68cd893dee 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -214,7 +214,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
int flags)
{
struct stored_bitmap *stored;
- khiter_t hash_pos;
+ kh_ensitr_t hash_pos;
int ret;
stored = xmalloc(sizeof(struct stored_bitmap));
@@ -235,7 +235,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
return NULL;
}
- kh_value(index->bitmaps, hash_pos) = stored;
+ kh_ens_val(index->bitmaps, hash_pos) = stored;
return stored;
}
@@ -721,7 +721,7 @@ static struct stored_bitmap *lazy_bitmap_for_commit(struct bitmap_index *bitmap_
static size_t xor_items_nr = 0, xor_items_alloc = 0;
static int is_corrupt = 0;
int xor_flags;
- khiter_t hash_pos;
+ kh_ensitr_t hash_pos;
struct bitmap_lookup_table_xor_item *xor_item;
if (is_corrupt)
@@ -766,8 +766,8 @@ static struct stored_bitmap *lazy_bitmap_for_commit(struct bitmap_index *bitmap_
* has already been stored. So, assign this stored bitmap
* to the xor_bitmap.
*/
- if (hash_pos < kh_end(bitmap_git->bitmaps) &&
- (xor_bitmap = kh_value(bitmap_git->bitmaps, hash_pos)))
+ if (!kh_ens_is_end(hash_pos) &&
+ (xor_bitmap = kh_ens_val(bitmap_git->bitmaps, hash_pos)))
break;
xor_items_nr++;
xor_row = triplet.xor_row;
@@ -841,9 +841,9 @@ static struct stored_bitmap *lazy_bitmap_for_commit(struct bitmap_index *bitmap_
struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
struct commit *commit)
{
- khiter_t hash_pos = kh_get_oid_map(bitmap_git->bitmaps,
+ kh_ensitr_t hash_pos = kh_get_oid_map(bitmap_git->bitmaps,
commit->object.oid);
- if (hash_pos >= kh_end(bitmap_git->bitmaps)) {
+ if (kh_ens_is_end(hash_pos)) {
struct stored_bitmap *bitmap = NULL;
if (!bitmap_git->table_lookup)
return NULL;
@@ -855,17 +855,17 @@ struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
return NULL;
return lookup_stored_bitmap(bitmap);
}
- return lookup_stored_bitmap(kh_value(bitmap_git->bitmaps, hash_pos));
+ return lookup_stored_bitmap(kh_ens_val(bitmap_git->bitmaps, hash_pos));
}
static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,
const struct object_id *oid)
{
kh_oid_pos_t *positions = bitmap_git->ext_index.positions;
- khiter_t pos = kh_get_oid_pos(positions, *oid);
+ kh_ensitr_t pos = kh_get_oid_pos(positions, *oid);
- if (pos < kh_end(positions)) {
- int bitmap_pos = kh_value(positions, pos);
+ if (!kh_ens_is_end(pos)) {
+ int bitmap_pos = kh_ens_val(positions, pos);
return bitmap_pos + bitmap_num_objects(bitmap_git);
}
@@ -913,7 +913,7 @@ static int ext_index_add_object(struct bitmap_index *bitmap_git,
{
struct eindex *eindex = &bitmap_git->ext_index;
- khiter_t hash_pos;
+ kh_ensitr_t hash_pos;
int hash_ret;
int bitmap_pos;
@@ -928,10 +928,10 @@ static int ext_index_add_object(struct bitmap_index *bitmap_git,
bitmap_pos = eindex->count;
eindex->objects[eindex->count] = object;
eindex->hashes[eindex->count] = pack_name_hash(name);
- kh_value(eindex->positions, hash_pos) = bitmap_pos;
+ kh_ens_val(eindex->positions, hash_pos) = bitmap_pos;
eindex->count++;
} else {
- bitmap_pos = kh_value(eindex->positions, hash_pos);
+ bitmap_pos = kh_ens_val(eindex->positions, hash_pos);
}
return bitmap_pos + bitmap_num_objects(bitmap_git);
@@ -2361,7 +2361,7 @@ int test_bitmap_commits(struct repository *r)
die(_("failed to load bitmap indexes"));
}
- kh_foreach(bitmap_git->bitmaps, oid, value, {
+ kh_ens_foreach(bitmap_git->bitmaps, oid, value, {
printf_ln("%s", oid_to_hex(&oid));
});
@@ -2479,7 +2479,7 @@ void free_bitmap_index(struct bitmap_index *b)
ewah_pool_free(b->tags);
if (b->bitmaps) {
struct stored_bitmap *sb;
- kh_foreach_value(b->bitmaps, sb, {
+ kh_ens_foreach_value(b->bitmaps, sb, {
ewah_pool_free(sb->root);
free(sb);
});
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] switch to tombstone-free khashl table
2024-03-25 23:07 [PATCH 0/3] switch to tombstone-free khashl table Eric Wong
` (3 preceding siblings ...)
2024-03-25 23:07 ` [REJECT 4/3] switch to khashl ensemble Eric Wong
@ 2024-03-26 17:40 ` Junio C Hamano
2024-04-19 21:31 ` Junio C Hamano
4 siblings, 1 reply; 14+ messages in thread
From: Junio C Hamano @ 2024-03-26 17:40 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Eric Wong <e@80x24.org> writes:
> The memory improvement is minor, but any memory reduction at all
> is welcome at this point. Fortunately, this set of changes is
> unintrusive.
>
> I have some other ideas that I'll hopefully get to implement before
> swapping kills all my SSDs (see bottom).
Please describe what this topic aims at to sell the topic better.
Are we trying to reduce memory footprint? In other words, if this
topic were to hit a released version of Git, what would the short
paragraph description for the topic in the release notes look like?
* The khash.h hashtable implementation has been replaced with
khashl.h that is mostly API compatible with reduced memory
consumption, simpler insertion and a bit slower deletion.
or somesuch.
A performance oriented topic would be helped to have benchmark
numbers to show how much improvement it makes and a memory reduction
topic would be helped to have some numbers in the cover letter. It
is OK to summarize/duplicate what appears in the proposed log
message of some step; it does not need too much text to say 100MB
total allocations reduced by 10MB or something like that, for
example.
An API improvement topic would be helped to have an example rewrite
of a caller (or just a reference to a representative one, i.e., "see
how the caller in function X gets simplified in [PATCH 04/28]") in
the cover letter.
A bugfix topic would be helped to have an end-user visible effect in
the cover letter.
Thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] treewide: switch to khashl for memory savings
2024-03-25 23:07 ` [PATCH 2/3] treewide: switch to khashl for memory savings Eric Wong
@ 2024-03-26 17:48 ` Junio C Hamano
2024-03-27 9:37 ` Jeff King
0 siblings, 1 reply; 14+ messages in thread
From: Junio C Hamano @ 2024-03-26 17:48 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Eric Wong <e@80x24.org> writes:
> khashl is an updated version of khash with less memory overhead
> (one bit/bucket instead of two) than the original khash and
> similar overall performance. Insertions are simpler (linear
> probing) but deletions may be slightly slower[1]. Of course,
> the majority of hash tables in git do not delete individual
> elements.
$ make builtin/fast-import.sp ;# part of make sparse
SP builtin/fast-import.c
builtin/fast-import.c: note: in included file (through oidset.h, packfile.h):
khashl.h:516:1: error: Using plain integer as NULL pointer
khashl.h:516:1: error: Using plain integer as NULL pointer
make: *** [Makefile:3237: builtin/fast-import.sp] Error 1
I found IMPL_GET and IMPL_DEL's use of (h->keys == 0) were giving
one of these two, and managed to reduce the error to just one with
the attached patch, but I don't know what the other error is coming
from.
khashl.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git c/khashl.h w/khashl.h
index 8ffe80fbb2..663e36cd2d 100644
--- c/khashl.h
+++ w/khashl.h
@@ -101,7 +101,7 @@ static kh_inline khint_t __kh_h2b(khint_t hash, khint_t bits) { return hash * 26
#define __KHASHL_IMPL_GET(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
SCOPE khint_t prefix##_getp_core(const HType *h, const khkey_t *key, khint_t hash) { \
khint_t i, last, n_buckets, mask; \
- if (h->keys == 0) return 0; \
+ if (!h->keys) return 0; \
n_buckets = (khint_t)1U << h->bits; \
mask = n_buckets - 1U; \
i = last = __kh_h2b(hash, h->bits); \
@@ -183,7 +183,7 @@ static kh_inline khint_t __kh_h2b(khint_t hash, khint_t bits) { return hash * 26
#define __KHASHL_IMPL_DEL(SCOPE, HType, prefix, khkey_t, __hash_fn) \
SCOPE int prefix##_del(HType *h, khint_t i) { \
khint_t j = i, k, mask, n_buckets; \
- if (h->keys == 0) return 0; \
+ if (!h->keys) return 0; \
n_buckets = (khint_t)1U<<h->bits; \
mask = n_buckets - 1U; \
while (1) { \
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] treewide: switch to khashl for memory savings
2024-03-26 17:48 ` Junio C Hamano
@ 2024-03-27 9:37 ` Jeff King
2024-03-27 21:54 ` Junio C Hamano
0 siblings, 1 reply; 14+ messages in thread
From: Jeff King @ 2024-03-27 9:37 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Eric Wong, git
On Tue, Mar 26, 2024 at 10:48:40AM -0700, Junio C Hamano wrote:
> $ make builtin/fast-import.sp ;# part of make sparse
> SP builtin/fast-import.c
> builtin/fast-import.c: note: in included file (through oidset.h, packfile.h):
> khashl.h:516:1: error: Using plain integer as NULL pointer
> khashl.h:516:1: error: Using plain integer as NULL pointer
> make: *** [Makefile:3237: builtin/fast-import.sp] Error 1
>
> I found IMPL_GET and IMPL_DEL's use of (h->keys == 0) were giving
> one of these two, and managed to reduce the error to just one with
> the attached patch, but I don't know what the other error is coming
> from.
Probably:
diff --git a/khashl.h b/khashl.h
index 8fcebed237..1e724bbf88 100644
--- a/khashl.h
+++ b/khashl.h
@@ -116,7 +116,7 @@ static kh_inline khint_t __kh_h2b(khint_t hash, khint_t bits) { return hash * 26
#define __KHASHL_IMPL_RESIZE(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
SCOPE void prefix##_resize(HType *h, khint_t new_n_buckets) { \
- khint32_t *new_used = 0; \
+ khint32_t *new_used = NULL; \
khint_t j = 0, x = new_n_buckets, n_buckets, new_bits, new_mask; \
while ((x >>= 1) != 0) ++j; \
if (new_n_buckets & (new_n_buckets - 1)) ++j; \
-Peff
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] treewide: switch to khashl for memory savings
2024-03-27 9:37 ` Jeff King
@ 2024-03-27 21:54 ` Junio C Hamano
0 siblings, 0 replies; 14+ messages in thread
From: Junio C Hamano @ 2024-03-27 21:54 UTC (permalink / raw)
To: Jeff King; +Cc: Eric Wong, git
Jeff King <peff@peff.net> writes:
> On Tue, Mar 26, 2024 at 10:48:40AM -0700, Junio C Hamano wrote:
>
>> $ make builtin/fast-import.sp ;# part of make sparse
>> SP builtin/fast-import.c
>> builtin/fast-import.c: note: in included file (through oidset.h, packfile.h):
>> khashl.h:516:1: error: Using plain integer as NULL pointer
>> khashl.h:516:1: error: Using plain integer as NULL pointer
>> make: *** [Makefile:3237: builtin/fast-import.sp] Error 1
>>
>> I found IMPL_GET and IMPL_DEL's use of (h->keys == 0) were giving
>> one of these two, and managed to reduce the error to just one with
>> the attached patch, but I don't know what the other error is coming
>> from.
>
> Probably:
>
> diff --git a/khashl.h b/khashl.h
> index 8fcebed237..1e724bbf88 100644
> --- a/khashl.h
> +++ b/khashl.h
> @@ -116,7 +116,7 @@ static kh_inline khint_t __kh_h2b(khint_t hash, khint_t bits) { return hash * 26
>
> #define __KHASHL_IMPL_RESIZE(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
> SCOPE void prefix##_resize(HType *h, khint_t new_n_buckets) { \
> - khint32_t *new_used = 0; \
> + khint32_t *new_used = NULL; \
> khint_t j = 0, x = new_n_buckets, n_buckets, new_bits, new_mask; \
> while ((x >>= 1) != 0) ++j; \
> if (new_n_buckets & (new_n_buckets - 1)) ++j; \
>
> -Peff
Spot on. With this (and the other two 0 -> NULL fixes), and with
the SWAP() thing in brian's credential series fixed, the tip of
'seen' passes the static-analysis and sparse CI jobs again.
Thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] switch to tombstone-free khashl table
2024-03-26 17:40 ` [PATCH 0/3] switch to tombstone-free khashl table Junio C Hamano
@ 2024-04-19 21:31 ` Junio C Hamano
2024-04-19 21:46 ` Eric Wong
0 siblings, 1 reply; 14+ messages in thread
From: Junio C Hamano @ 2024-04-19 21:31 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Junio C Hamano <gitster@pobox.com> writes:
> Eric Wong <e@80x24.org> writes:
>
>> The memory improvement is minor, but any memory reduction at all
>> is welcome at this point. Fortunately, this set of changes is
>> unintrusive.
>>
>> I have some other ideas that I'll hopefully get to implement before
>> swapping kills all my SSDs (see bottom).
>
> Please describe what this topic aims at to sell the topic better.
> Are we trying to reduce memory footprint? In other words, if this
> topic were to hit a released version of Git, what would the short
> paragraph description for the topic in the release notes look like?
> ...
So, did anything happened since this exchange? I remember that we
caught and fixed a few minor sparse errors, but other than that, I
am not sure what to do with this topic.
Not that I want to merge loud tree-wide topics down during the
prerelease period...
Thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] switch to tombstone-free khashl table
2024-04-19 21:31 ` Junio C Hamano
@ 2024-04-19 21:46 ` Eric Wong
0 siblings, 0 replies; 14+ messages in thread
From: Eric Wong @ 2024-04-19 21:46 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
> > Eric Wong <e@80x24.org> writes:
> >
> >> The memory improvement is minor, but any memory reduction at all
> >> is welcome at this point. Fortunately, this set of changes is
> >> unintrusive.
> >>
> >> I have some other ideas that I'll hopefully get to implement before
> >> swapping kills all my SSDs (see bottom).
> >
> > Please describe what this topic aims at to sell the topic better.
> > Are we trying to reduce memory footprint? In other words, if this
> > topic were to hit a released version of Git, what would the short
> > paragraph description for the topic in the release notes look like?
> > ...
>
> So, did anything happened since this exchange? I remember that we
> caught and fixed a few minor sparse errors, but other than that, I
> am not sure what to do with this topic.
Not really... I've been thinking we can beat khashl for our
purposes usage by allowing explicit tombstones to be configured
and getting rid of the ->used bitmap entirely.
One goal is to eventually reuse the code with the open-coded
hash table in object.c That said, I've been bogged down by
personal crap this year and don't know how/if I'll be able to
hack on it this year.
> Not that I want to merge loud tree-wide topics down during the
> prerelease period...
No worries, we can keep it out for now and work on it
incrementally or drop it entirely in favor of something else
down the line...
git's about to turn 20, and I really want to ensure it and the
tools around it continue to be usable on computers from 20-25
years ago.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] switch to tombstone-free khashl table
2024-03-28 15:52 ` Junio C Hamano
@ 2024-03-28 17:56 ` Eric Wong
0 siblings, 0 replies; 14+ messages in thread
From: Eric Wong @ 2024-03-28 17:56 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Junio C Hamano <gitster@pobox.com> wrote:
> Eric Wong <e@80x24.org> writes:
> > Range-diff:
> > -: ---------- > 1: 3bf3148cab list-objects-filter: use kh_size API
> > 1: e74965907e ! 2: 09900edb48 treewide: switch to khashl for memory savings
>
> Do you have the correct range-diff? The previous round had the
> change to the list-object-filter.c to use kh_size() already.
>
> But I see the 0 -> NULL fixes. Perhaps the left-side base was off
> by one when you took the range-diff and there is nothing else going
> on that we should be worried about...
Odd... I switched to a different machine (w) for v2 due to
connectivity problems to the original machine (m) I did v1 on
and applied the patches sent to the list.
I did end up rebasing v1 on (w) against the newer master:
c75fd8d815 (The eleventh batch, 2024-03-25)
instead of commit 11c821f2f2 (The tenth batch, 2024-03-21)
on (m).
On (w):
git format-patch -o $OUT/ khashl-base..khashl-v2 \
--cover-letter --range-diff=khashl-v1 -v2
Seems to mess up infer_range_diff_ranges and it chose `khashl-v2'
instead of `khash-base' as the `a' part of the range for r1.
(m) doesn't do this, both running 2.44.0.32*-ish
Here it is from (w) with the explicit `a..' part for --range-diff:
git format-patch -o $OUT/ khashl-base..khashl-v2 \
--cover-letter --range-diff=khashl-base..khashl-v1 -v2
Range-diff against v1:
1: 3bf3148cab = 1: 3bf3148cab list-objects-filter: use kh_size API
2: e74965907e ! 2: 09900edb48 treewide: switch to khashl for memory savings
@@ Commit message
khashl is an updated version of khash with less memory overhead
(one bit/bucket instead of two) than the original khash and
- similar overall performance. Insertions are simpler (linear
- probing) but deletions may be slightly slower[1]. Of course,
- the majority of hash tables in git do not delete individual
- elements.
+ similar overall performance. According to its author,
+ insertions are simpler (linear probing) but deletions may be
+ slightly slower[1]. Of course, the majority of hash tables in
+ git do not delete individual elements.
Overall memory usage did not decrease much, as the hash tables
and elements we store in them are big and currently dwarf the
overhead of the khash internals. Only around 10 MB in
- allocations (not peak use) is saved when doing a no-op `git gc'
- of a Linux kernel object store with thousands of refs and
- islands.
+ allocations (and a few dozen KB peak use out of ~6 GB) is saved
+ when doing a no-op `git gc' of a Linux kernel object store with
+ thousands of refs and islands.
A summary of differences I've found from khash to khashl:
@@ Commit message
* flesh out KHASHL_{SET,MAP}_INIT wrappers with *_clear, *_resize,
and *_release functions
+ * sparse fixes from Junio and Jeff
+
[1] https://attractivechaos.wordpress.com/2019/12/28/deletion-from-hash-tables-without-tombstones/
[2] git clone https://github.com/attractivechaos/klib.git
2895a16cb55e (support an ensemble of hash tables, 2023-12-18)
@@ Commit message
typedef) and was the only place where I had to change a definition.
Signed-off-by: Eric Wong <e@80x24.org>
+ Helped-by: Junio C Hamano <gitster@pobox.com>
+ Helped-by: Jeff King <peff@peff.net>
## builtin/fast-import.c ##
@@
@@ khashl.h (new)
+#define __KHASHL_IMPL_GET(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ SCOPE khint_t prefix##_getp_core(const HType *h, const khkey_t *key, khint_t hash) { \
+ khint_t i, last, n_buckets, mask; \
-+ if (h->keys == 0) return 0; \
++ if (!h->keys) return 0; \
+ n_buckets = (khint_t)1U << h->bits; \
+ mask = n_buckets - 1U; \
+ i = last = __kh_h2b(hash, h->bits); \
@@ khashl.h (new)
+
+#define __KHASHL_IMPL_RESIZE(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ SCOPE void prefix##_resize(HType *h, khint_t new_n_buckets) { \
-+ khint32_t *new_used = 0; \
++ khint32_t *new_used = NULL; \
+ khint_t j = 0, x = new_n_buckets, n_buckets, new_bits, new_mask; \
+ while ((x >>= 1) != 0) ++j; \
+ if (new_n_buckets & (new_n_buckets - 1)) ++j; \
@@ khashl.h (new)
+#define __KHASHL_IMPL_DEL(SCOPE, HType, prefix, khkey_t, __hash_fn) \
+ SCOPE int prefix##_del(HType *h, khint_t i) { \
+ khint_t j = i, k, mask, n_buckets; \
-+ if (h->keys == 0) return 0; \
++ if (!h->keys) return 0; \
+ n_buckets = (khint_t)1U<<h->bits; \
+ mask = n_buckets - 1U; \
+ while (1) { \
3: 744e1b7198 = 3: bfb20eae37 khashl: fix ensemble lookups on empty table
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/3] switch to tombstone-free khashl table
2024-03-28 10:13 Eric Wong
@ 2024-03-28 15:52 ` Junio C Hamano
2024-03-28 17:56 ` Eric Wong
0 siblings, 1 reply; 14+ messages in thread
From: Junio C Hamano @ 2024-03-28 15:52 UTC (permalink / raw)
To: Eric Wong; +Cc: git
Eric Wong <e@80x24.org> writes:
> Fortunately, this set of changes is unintrusive; but I'm
> hoping to have more time to make deeper changes this year.
>
> Eric Wong (3):
> list-objects-filter: use kh_size API
> treewide: switch to khashl for memory savings
> khashl: fix ensemble lookups on empty table
>
> builtin/fast-import.c | 2 +-
> builtin/fsmonitor--daemon.c | 4 +-
> delta-islands.c | 4 +-
> khash.h | 338 -----------------------
> khashl.h | 522 ++++++++++++++++++++++++++++++++++++
> list-objects-filter.c | 2 +-
> object-store-ll.h | 2 +-
> object-store.h | 7 +-
> oidset.h | 2 +-
> pack-bitmap.h | 2 +-
> 10 files changed, 535 insertions(+), 350 deletions(-)
> delete mode 100644 khash.h
> create mode 100644 khashl.h
>
> Range-diff:
> -: ---------- > 1: 3bf3148cab list-objects-filter: use kh_size API
> 1: e74965907e ! 2: 09900edb48 treewide: switch to khashl for memory savings
Do you have the correct range-diff? The previous round had the
change to the list-object-filter.c to use kh_size() already.
But I see the 0 -> NULL fixes. Perhaps the left-side base was off
by one when you took the range-diff and there is nothing else going
on that we should be worried about...
> @@ Commit message
>
> khashl is an updated version of khash with less memory overhead
> (one bit/bucket instead of two) than the original khash and
> - similar overall performance. Insertions are simpler (linear
> - probing) but deletions may be slightly slower[1]. Of course,
> - the majority of hash tables in git do not delete individual
> - elements.
> + similar overall performance. According to its author,
> + insertions are simpler (linear probing) but deletions may be
> + slightly slower[1]. Of course, the majority of hash tables in
> + git do not delete individual elements.
>
> Overall memory usage did not decrease much, as the hash tables
> and elements we store in them are big and currently dwarf the
> overhead of the khash internals. Only around 10 MB in
> - allocations (not peak use) is saved when doing a no-op `git gc'
> - of a Linux kernel object store with thousands of refs and
> - islands.
> + allocations (and a few dozen KB peak use out of ~6 GB) is saved
> + when doing a no-op `git gc' of a Linux kernel object store with
> + thousands of refs and islands.
>
> A summary of differences I've found from khash to khashl:
>
> @@ Commit message
> * flesh out KHASHL_{SET,MAP}_INIT wrappers with *_clear, *_resize,
> and *_release functions
>
> + * sparse fixes from Junio and Jeff
> +
> [1] https://attractivechaos.wordpress.com/2019/12/28/deletion-from-hash-tables-without-tombstones/
> [2] git clone https://github.com/attractivechaos/klib.git
> 2895a16cb55e (support an ensemble of hash tables, 2023-12-18)
> @@ Commit message
> typedef) and was the only place where I had to change a definition.
>
> Signed-off-by: Eric Wong <e@80x24.org>
> + Helped-by: Junio C Hamano <gitster@pobox.com>
> + Helped-by: Jeff King <peff@peff.net>
>
> ## builtin/fast-import.c ##
> @@
> @@ khashl.h (new)
> +#define __KHASHL_IMPL_GET(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
> + SCOPE khint_t prefix##_getp_core(const HType *h, const khkey_t *key, khint_t hash) { \
> + khint_t i, last, n_buckets, mask; \
> -+ if (h->keys == 0) return 0; \
> ++ if (!h->keys) return 0; \
> + n_buckets = (khint_t)1U << h->bits; \
> + mask = n_buckets - 1U; \
> + i = last = __kh_h2b(hash, h->bits); \
> @@ khashl.h (new)
> +
> +#define __KHASHL_IMPL_RESIZE(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
> + SCOPE void prefix##_resize(HType *h, khint_t new_n_buckets) { \
> -+ khint32_t *new_used = 0; \
> ++ khint32_t *new_used = NULL; \
> + khint_t j = 0, x = new_n_buckets, n_buckets, new_bits, new_mask; \
> + while ((x >>= 1) != 0) ++j; \
> + if (new_n_buckets & (new_n_buckets - 1)) ++j; \
> @@ khashl.h (new)
> +#define __KHASHL_IMPL_DEL(SCOPE, HType, prefix, khkey_t, __hash_fn) \
> + SCOPE int prefix##_del(HType *h, khint_t i) { \
> + khint_t j = i, k, mask, n_buckets; \
> -+ if (h->keys == 0) return 0; \
> ++ if (!h->keys) return 0; \
> + n_buckets = (khint_t)1U<<h->bits; \
> + mask = n_buckets - 1U; \
> + while (1) { \
> 2: 744e1b7198 = 3: bfb20eae37 khashl: fix ensemble lookups on empty table
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 0/3] switch to tombstone-free khashl table
@ 2024-03-28 10:13 Eric Wong
2024-03-28 15:52 ` Junio C Hamano
0 siblings, 1 reply; 14+ messages in thread
From: Eric Wong @ 2024-03-28 10:13 UTC (permalink / raw)
To: git
This is another step in slowly reducing memory usage of `git gc'
and associated tasks. khashl is an updated version of khash
which eliminates tombstones for deleted elements to save space.
The overall memory improvement with our codebase is tiny (a few
dozen KB out of several GB at peak, about 10MB over the lifetime
of a process). Any memory reduction at all is welcome at this
point; and khashl comes with some new optional features and
enhancements which may come in handy someday.
I haven't been able to validate CPU-dependent improvements
claimed by the author due to system noise from working on a
shared server. No aberrant behavior has been noticed in
day-to-day `production' use on public facing servers.
Keep in mind the switch linear probing for performance is
consistent with findings made for the open-coded ->obj_hash in
object.c
Fortunately, this set of changes is unintrusive; but I'm
hoping to have more time to make deeper changes this year.
Eric Wong (3):
list-objects-filter: use kh_size API
treewide: switch to khashl for memory savings
khashl: fix ensemble lookups on empty table
builtin/fast-import.c | 2 +-
builtin/fsmonitor--daemon.c | 4 +-
delta-islands.c | 4 +-
khash.h | 338 -----------------------
khashl.h | 522 ++++++++++++++++++++++++++++++++++++
list-objects-filter.c | 2 +-
object-store-ll.h | 2 +-
object-store.h | 7 +-
oidset.h | 2 +-
pack-bitmap.h | 2 +-
10 files changed, 535 insertions(+), 350 deletions(-)
delete mode 100644 khash.h
create mode 100644 khashl.h
Range-diff:
-: ---------- > 1: 3bf3148cab list-objects-filter: use kh_size API
1: e74965907e ! 2: 09900edb48 treewide: switch to khashl for memory savings
@@ Commit message
khashl is an updated version of khash with less memory overhead
(one bit/bucket instead of two) than the original khash and
- similar overall performance. Insertions are simpler (linear
- probing) but deletions may be slightly slower[1]. Of course,
- the majority of hash tables in git do not delete individual
- elements.
+ similar overall performance. According to its author,
+ insertions are simpler (linear probing) but deletions may be
+ slightly slower[1]. Of course, the majority of hash tables in
+ git do not delete individual elements.
Overall memory usage did not decrease much, as the hash tables
and elements we store in them are big and currently dwarf the
overhead of the khash internals. Only around 10 MB in
- allocations (not peak use) is saved when doing a no-op `git gc'
- of a Linux kernel object store with thousands of refs and
- islands.
+ allocations (and a few dozen KB peak use out of ~6 GB) is saved
+ when doing a no-op `git gc' of a Linux kernel object store with
+ thousands of refs and islands.
A summary of differences I've found from khash to khashl:
@@ Commit message
* flesh out KHASHL_{SET,MAP}_INIT wrappers with *_clear, *_resize,
and *_release functions
+ * sparse fixes from Junio and Jeff
+
[1] https://attractivechaos.wordpress.com/2019/12/28/deletion-from-hash-tables-without-tombstones/
[2] git clone https://github.com/attractivechaos/klib.git
2895a16cb55e (support an ensemble of hash tables, 2023-12-18)
@@ Commit message
typedef) and was the only place where I had to change a definition.
Signed-off-by: Eric Wong <e@80x24.org>
+ Helped-by: Junio C Hamano <gitster@pobox.com>
+ Helped-by: Jeff King <peff@peff.net>
## builtin/fast-import.c ##
@@
@@ khashl.h (new)
+#define __KHASHL_IMPL_GET(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ SCOPE khint_t prefix##_getp_core(const HType *h, const khkey_t *key, khint_t hash) { \
+ khint_t i, last, n_buckets, mask; \
-+ if (h->keys == 0) return 0; \
++ if (!h->keys) return 0; \
+ n_buckets = (khint_t)1U << h->bits; \
+ mask = n_buckets - 1U; \
+ i = last = __kh_h2b(hash, h->bits); \
@@ khashl.h (new)
+
+#define __KHASHL_IMPL_RESIZE(SCOPE, HType, prefix, khkey_t, __hash_fn, __hash_eq) \
+ SCOPE void prefix##_resize(HType *h, khint_t new_n_buckets) { \
-+ khint32_t *new_used = 0; \
++ khint32_t *new_used = NULL; \
+ khint_t j = 0, x = new_n_buckets, n_buckets, new_bits, new_mask; \
+ while ((x >>= 1) != 0) ++j; \
+ if (new_n_buckets & (new_n_buckets - 1)) ++j; \
@@ khashl.h (new)
+#define __KHASHL_IMPL_DEL(SCOPE, HType, prefix, khkey_t, __hash_fn) \
+ SCOPE int prefix##_del(HType *h, khint_t i) { \
+ khint_t j = i, k, mask, n_buckets; \
-+ if (h->keys == 0) return 0; \
++ if (!h->keys) return 0; \
+ n_buckets = (khint_t)1U<<h->bits; \
+ mask = n_buckets - 1U; \
+ while (1) { \
2: 744e1b7198 = 3: bfb20eae37 khashl: fix ensemble lookups on empty table
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-04-19 21:52 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-25 23:07 [PATCH 0/3] switch to tombstone-free khashl table Eric Wong
2024-03-25 23:07 ` [PATCH 1/3] list-objects-filter: use kh_size API Eric Wong
2024-03-25 23:07 ` [PATCH 2/3] treewide: switch to khashl for memory savings Eric Wong
2024-03-26 17:48 ` Junio C Hamano
2024-03-27 9:37 ` Jeff King
2024-03-27 21:54 ` Junio C Hamano
2024-03-25 23:07 ` [PATCH 3/3] khashl: fix ensemble lookups on empty table Eric Wong
2024-03-25 23:07 ` [REJECT 4/3] switch to khashl ensemble Eric Wong
2024-03-26 17:40 ` [PATCH 0/3] switch to tombstone-free khashl table Junio C Hamano
2024-04-19 21:31 ` Junio C Hamano
2024-04-19 21:46 ` Eric Wong
2024-03-28 10:13 Eric Wong
2024-03-28 15:52 ` Junio C Hamano
2024-03-28 17:56 ` Eric Wong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.