aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-06 07:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

ccan: update to get smaller htable implementation.

Browse Source 
MCP results from 5 runs, min-max(mean +/- stddev):
	store_rewrite_sec:46.750000-48.280000(47.512+/-0.51)
	listnodes_sec:1.100000-1.400000(1.192+/-0.11)
	listchannels_sec:49.530000-56.410000(53.914+/-2.3)
	routing_sec:29.500000-32.970000(30.392+/-1.3)
	peer_write_all_sec:50.760000-52.140000(51.348+/-0.59)

MCP notable changes from previous patch (>1 stddev):
-	vsz_kb:2639240
+	vsz_kb:2638880
This commit is contained in:
Rusty Russell
2019-04-08 16:04:01 +09:30
committed by neil saitug
parent d4ab0592c5
commit 3c13369431
10 changed files with 66 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ccan/README
View File

@@ -1,3 +1,3 @@
CCAN imported from http://ccodearchive.net.
CCAN version: init-2470-g2b3517d4
CCAN version: init-2473-g7623d082

54
ccan/ccan/htable/htable.c
View File

@@ -11,6 +11,9 @@
/* We use 0x1 as deleted marker. */
#define HTABLE_DELETED (0x1)
/* perfect_bitnum 63 means there's no perfect bitnum */
#define NO_PERFECT_BIT (sizeof(uintptr_t) * CHAR_BIT - 1)
static void *htable_default_alloc(struct htable *ht, size_t len)
{
return calloc(len, 1);
@@ -58,6 +61,11 @@ static inline bool entry_is_valid(uintptr_t e)
return e > HTABLE_DELETED;
}
static inline uintptr_t ht_perfect_mask(const struct htable *ht)
{
return (uintptr_t)2 << ht->perfect_bitnum;
}
static inline uintptr_t get_hash_ptr_bits(const struct htable *ht,
size_t hash)
{
@@ -65,7 +73,7 @@ static inline uintptr_t get_hash_ptr_bits(const struct htable *ht,
* end is quite expensive. But the lower bits are redundant, so
* we fold the value first. */
return (hash ^ (hash >> ht->bits))
& ht->common_mask & ~ht->perfect_bit;
& ht->common_mask & ~ht_perfect_mask(ht);
}
void htable_init(struct htable *ht,
@@ -75,14 +83,17 @@ void htable_init(struct htable *ht,
*ht = empty;
ht->rehash = rehash;
ht->priv = priv;
ht->table = &ht->perfect_bit;
ht->table = &ht->common_bits;
}
/* We've changed ht->bits, update ht->max and ht->max_with_deleted */
static void htable_adjust_capacity(struct htable *ht)
static inline size_t ht_max(const struct htable *ht)
{
ht->max = ((size_t)3 << ht->bits) / 4;
ht->max_with_deleted = ((size_t)9 << ht->bits) / 10;
return ((size_t)3 << ht->bits) / 4;
}
static inline size_t ht_max_with_deleted(const struct htable *ht)
{
return ((size_t)9 << ht->bits) / 10;
}
bool htable_init_sized(struct htable *ht,
@@ -99,17 +110,16 @@ bool htable_init_sized(struct htable *ht,
ht->table = htable_alloc(ht, sizeof(size_t) << ht->bits);
if (!ht->table) {
ht->table = &ht->perfect_bit;
ht->table = &ht->common_bits;
return false;
}
htable_adjust_capacity(ht);
(void)htable_debug(ht, HTABLE_LOC);
return true;
}
void htable_clear(struct htable *ht)
{
if (ht->table != &ht->perfect_bit)
if (ht->table != &ht->common_bits)
htable_free(ht, (void *)ht->table);
htable_init(ht, ht->rehash, ht->priv);
}
@@ -152,7 +162,7 @@ void *htable_firstval_(const struct htable *ht,
struct htable_iter *i, size_t hash)
{
i->off = hash_bucket(ht, hash);
return htable_val(ht, i, hash, ht->perfect_bit);
return htable_val(ht, i, hash, ht_perfect_mask(ht));
}
void *htable_nextval_(const struct htable *ht,
@@ -195,7 +205,7 @@ void *htable_prev_(const struct htable *ht, struct htable_iter *i)
static void ht_add(struct htable *ht, const void *new, size_t h)
{
size_t i;
uintptr_t perfect = ht->perfect_bit;
uintptr_t perfect = ht_perfect_mask(ht);
i = hash_bucket(ht, h);
@@ -219,19 +229,18 @@ static COLD bool double_table(struct htable *ht)
return false;
}
ht->bits++;
htable_adjust_capacity(ht);
/* If we lost our "perfect bit", get it back now. */
if (!ht->perfect_bit && ht->common_mask) {
if (ht->perfect_bitnum == NO_PERFECT_BIT && ht->common_mask) {
for (i = 0; i < sizeof(ht->common_mask) * CHAR_BIT; i++) {
if (ht->common_mask & ((size_t)1 << i)) {
ht->perfect_bit = (size_t)1 << i;
if (ht->common_mask & ((size_t)2 << i)) {
ht->perfect_bitnum = i;
break;
}
}
}
if (oldtable != &ht->perfect_bit) {
if (oldtable != &ht->common_bits) {
for (i = 0; i < oldnum; i++) {
if (entry_is_valid(e = oldtable[i])) {
void *p = get_raw_ptr(ht, e);
@@ -249,7 +258,7 @@ static COLD bool double_table(struct htable *ht)
static COLD void rehash_table(struct htable *ht)
{
size_t start, i;
uintptr_t e;
uintptr_t e, perfect = ht_perfect_mask(ht);
/* Beware wrap cases: we need to start from first empty bucket. */
for (start = 0; ht->table[start]; start++);
@@ -261,7 +270,7 @@ static COLD void rehash_table(struct htable *ht)
continue;
if (e == HTABLE_DELETED)
ht->table[h] = 0;
else if (!(e & ht->perfect_bit)) {
else if (!(e & perfect)) {
void *p = get_raw_ptr(ht, e);
ht->table[h] = 0;
ht_add(ht, p, ht->rehash(p, ht->priv));
@@ -289,7 +298,7 @@ static COLD void update_common(struct htable *ht, const void *p)
ht->common_mask = ~((uintptr_t)1 << i);
ht->common_bits = ((uintptr_t)p & ht->common_mask);
ht->perfect_bit = 1;
ht->perfect_bitnum = 0;
(void)htable_debug(ht, HTABLE_LOC);
return;
}
@@ -312,15 +321,16 @@ static COLD void update_common(struct htable *ht, const void *p)
/* Take away those bits from our mask, bits and perfect bit. */
ht->common_mask &= ~maskdiff;
ht->common_bits &= ~maskdiff;
ht->perfect_bit &= ~maskdiff;
if (ht_perfect_mask(ht) & maskdiff)
ht->perfect_bitnum = NO_PERFECT_BIT;
(void)htable_debug(ht, HTABLE_LOC);
}
bool htable_add_(struct htable *ht, size_t hash, const void *p)
{
if (ht->elems+1 > ht->max && !double_table(ht))
if (ht->elems+1 > ht_max(ht) && !double_table(ht))
return false;
if (ht->elems+1 + ht->deleted > ht->max_with_deleted)
if (ht->elems+1 + ht->deleted > ht_max_with_deleted(ht))
rehash_table(ht);
assert(p);
if (((uintptr_t)p & ht->common_mask) != ht->common_bits)

7
ccan/ccan/htable/htable.h
View File

@@ -24,11 +24,10 @@
struct htable {
size_t (*rehash)(const void *elem, void *priv);
void *priv;
unsigned int bits;
size_t elems, deleted, max, max_with_deleted;
unsigned int bits, perfect_bitnum;
size_t elems, deleted;
/* These are the bits which are the same in all pointers. */
uintptr_t common_mask, common_bits;
uintptr_t perfect_bit;
uintptr_t *table;
};
@@ -50,7 +49,7 @@ struct htable {
* static struct htable ht = HTABLE_INITIALIZER(ht, rehash, NULL);
*/
#define HTABLE_INITIALIZER(name, rehash, priv) \
{ rehash, priv, 0, 0, 0, 0, 0, -1, 0, 0, &name.perfect_bit }
{ rehash, priv, 0, 0, 0, 0, -1, 0, &name.common_bits }
/**
* htable_init - initialize an empty hash table.

4
ccan/ccan/htable/test/run-copy.c
View File

@@ -28,8 +28,8 @@ int main(void)
htable_init(&ht, hash, NULL);
for (i = 0; i < NUM_VALS; i++) {
ok1(ht.max >= i);
ok1(ht.max <= i * 2);
ok1(ht_max(&ht) >= i);
ok1(ht_max(&ht) <= i * 2);
htable_add(&ht, hash(&val[i], NULL), &val[i]);
}

20
ccan/ccan/htable/test/run-debug.c
View File

@@ -121,7 +121,7 @@ int main(void)
dne = i;
htable_init(&ht, hash, NULL);
ok1(ht.max == 0);
ok1(ht_max(&ht) == 0);
ok1(ht.bits == 0);
/* We cannot find an entry which doesn't exist. */
@@ -130,7 +130,7 @@ int main(void)
/* This should increase it once. */
add_vals(&ht, val, 0, 1);
ok1(ht.bits == 1);
ok1(ht.max == 1);
ok1(ht_max(&ht) == 1);
weight = 0;
for (i = 0; i < sizeof(ht.common_mask) * CHAR_BIT; i++) {
if (ht.common_mask & ((uintptr_t)1 << i)) {
@@ -146,7 +146,7 @@ int main(void)
/* This should increase it again. */
add_vals(&ht, val, 1, 1);
ok1(ht.bits == 2);
ok1(ht.max == 3);
ok1(ht_max(&ht) == 3);
/* Mask should be set. */
ok1(ht.common_mask != 0);
@@ -194,29 +194,29 @@ int main(void)
/* Corner cases: wipe out the perfect bit using bogus pointer. */
htable_clear(&ht);
htable_add(&ht, hash(&val[NUM_VALS-1], NULL), &val[NUM_VALS-1]);
ok1(ht.perfect_bit);
perfect_bit = ht.perfect_bit;
ok1(ht_perfect_mask(&ht));
perfect_bit = ht_perfect_mask(&ht);
bad_pointer = (void *)((uintptr_t)&val[NUM_VALS-1] | perfect_bit);
htable_add(&ht, 0, bad_pointer);
ok1(ht.perfect_bit == 0);
ok1(ht_perfect_mask(&ht) == 0);
htable_del(&ht, 0, bad_pointer);
/* Enlarging should restore it... */
add_vals(&ht, val, 0, NUM_VALS-1);
ok1(ht.perfect_bit != 0);
ok1(ht_perfect_mask(&ht) != 0);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1024));
ok1(ht.max >= 1024);
ok1(ht_max(&ht) >= 1024);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1023));
ok1(ht.max >= 1023);
ok1(ht_max(&ht) >= 1023);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1025));
ok1(ht.max >= 1025);
ok1(ht_max(&ht) >= 1025);
htable_clear(&ht);
return exit_status();

4
ccan/ccan/htable/test/run-size.c
View File

@@ -26,8 +26,8 @@ int main(void)
htable_init(&ht, hash, NULL);
for (i = 0; i < NUM_VALS; i++) {
ok1(ht.max >= i);
ok1(ht.max <= i * 2);
ok1(ht_max(&ht) >= i);
ok1(ht_max(&ht) <= i * 2);
htable_add(&ht, hash(&val[i], NULL), &val[i]);
}
htable_clear(&ht);

4
ccan/ccan/htable/test/run-type-int.c
View File

@@ -127,7 +127,7 @@ int main(void)
dne = i;
htable_obj_init(&ht);
ok1(ht.raw.max == 0);
ok1(ht_max(&ht.raw) == 0);
ok1(ht.raw.bits == 0);
/* We cannot find an entry which doesn't exist. */
@@ -136,7 +136,7 @@ int main(void)
/* Fill it, it should increase in size. */
add_vals(&ht, val, NUM_VALS);
ok1(ht.raw.bits == NUM_BITS + 1);
ok1(ht.raw.max < (1 << ht.raw.bits));
ok1(ht_max(&ht.raw) < (1 << ht.raw.bits));
/* Mask should be set. */
ok1(ht.raw.common_mask != 0);

4
ccan/ccan/htable/test/run-type.c
View File

@@ -122,7 +122,7 @@ int main(void)
dne = i;
htable_obj_init(&ht);
ok1(ht.raw.max == 0);
ok1(ht_max(&ht.raw) == 0);
ok1(ht.raw.bits == 0);
/* We cannot find an entry which doesn't exist. */
@@ -131,7 +131,7 @@ int main(void)
/* Fill it, it should increase in size. */
add_vals(&ht, val, NUM_VALS);
ok1(ht.raw.bits == NUM_BITS + 1);
ok1(ht.raw.max < (1 << ht.raw.bits));
ok1(ht_max(&ht.raw) < (1 << ht.raw.bits));
/* Mask should be set. */
ok1(ht.raw.common_mask != 0);

20
ccan/ccan/htable/test/run.c
View File

@@ -111,7 +111,7 @@ int main(void)
dne = i;
htable_init(&ht, hash, NULL);
ok1(ht.max == 0);
ok1(ht_max(&ht) == 0);
ok1(ht.bits == 0);
/* We cannot find an entry which doesn't exist. */
@@ -120,7 +120,7 @@ int main(void)
/* This should increase it once. */
add_vals(&ht, val, 0, 1);
ok1(ht.bits == 1);
ok1(ht.max == 1);
ok1(ht_max(&ht) == 1);
weight = 0;
for (i = 0; i < sizeof(ht.common_mask) * CHAR_BIT; i++) {
if (ht.common_mask & ((uintptr_t)1 << i)) {
@@ -136,7 +136,7 @@ int main(void)
/* This should increase it again. */
add_vals(&ht, val, 1, 1);
ok1(ht.bits == 2);
ok1(ht.max == 3);
ok1(ht_max(&ht) == 3);
/* Mask should be set. */
ok1(ht.common_mask != 0);
@@ -183,29 +183,29 @@ int main(void)
/* Corner cases: wipe out the perfect bit using bogus pointer. */
htable_clear(&ht);
htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]));
ok1(ht.perfect_bit);
perfect_bit = ht.perfect_bit;
ok1(ht_perfect_mask(&ht));
perfect_bit = ht_perfect_mask(&ht);
htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]
| perfect_bit));
ok1(ht.perfect_bit == 0);
ok1(ht_perfect_mask(&ht) == 0);
htable_del(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1] | perfect_bit));
/* Enlarging should restore it... */
add_vals(&ht, val, 0, NUM_VALS-1);
ok1(ht.perfect_bit != 0);
ok1(ht_perfect_mask(&ht) != 0);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1024));
ok1(ht.max >= 1024);
ok1(ht_max(&ht) >= 1024);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1023));
ok1(ht.max >= 1023);
ok1(ht_max(&ht) >= 1023);
htable_clear(&ht);
ok1(htable_init_sized(&ht, hash, NULL, 1025));
ok1(ht.max >= 1025);
ok1(ht_max(&ht) >= 1025);
htable_clear(&ht);
return exit_status();

4
ccan/ccan/htable/tools/speed.c
View File

@@ -74,8 +74,8 @@ static size_t perfect(const struct htable *ht)
continue;
if (hash_bucket(ht, ht->rehash(get_raw_ptr(ht, ht->table[i]),
ht->priv)) == i) {
assert((ht->table[i] & ht->perfect_bit)
== ht->perfect_bit);
assert((ht->table[i] & ht_perfect_mask(ht))
== ht_perfect_mask(ht));
placed_perfect++;
}
}