Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
ccan
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
mirror
ccan
Commits
45f24da3
Commit
45f24da3
authored
Sep 27, 2011
by
Rusty Russell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
htable: start empty.
There's no real reason to start with 128 entries.
parent
cbca0212
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
87 additions
and
39 deletions
+87
-39
ccan/htable/htable.c
ccan/htable/htable.c
+16
-19
ccan/htable/test/run-size.c
ccan/htable/test/run-size.c
+36
-0
ccan/htable/test/run-type.c
ccan/htable/test/run-type.c
+7
-6
ccan/htable/test/run.c
ccan/htable/test/run.c
+28
-14
No files found.
ccan/htable/htable.c
View file @
45f24da3
...
...
@@ -7,9 +7,6 @@
#include <stdbool.h>
#include <assert.h>
/* This means a struct htable takes at least 512 bytes / 1k (32/64 bits). */
#define HTABLE_BASE_BITS 7
/* We use 0x1 as deleted marker. */
#define HTABLE_DELETED (0x1)
...
...
@@ -62,29 +59,27 @@ struct htable *htable_new(size_t (*rehash)(const void *elem, void *priv),
{
struct
htable
*
ht
=
malloc
(
sizeof
(
struct
htable
));
if
(
ht
)
{
ht
->
bits
=
HTABLE_BASE_BITS
;
ht
->
bits
=
0
;
ht
->
rehash
=
rehash
;
ht
->
priv
=
priv
;
ht
->
elems
=
0
;
ht
->
deleted
=
0
;
ht
->
max
=
((
size_t
)
1
<<
ht
->
bits
)
*
3
/
4
;
ht
->
max_with_deleted
=
((
size_t
)
1
<<
ht
->
bits
)
*
9
/
1
0
;
ht
->
max
=
0
;
ht
->
max_with_deleted
=
0
;
/* This guarantees we enter update_common first add. */
ht
->
common_mask
=
-
1
;
ht
->
common_bits
=
0
;
ht
->
perfect_bit
=
0
;
ht
->
table
=
calloc
(
1
<<
ht
->
bits
,
sizeof
(
uintptr_t
));
if
(
!
ht
->
table
)
{
free
(
ht
);
ht
=
NULL
;
}
/* Dummy table until first insert. */
ht
->
table
=
&
ht
->
perfect_bit
;
}
return
ht
;
}
void
htable_free
(
const
struct
htable
*
ht
)
{
free
((
void
*
)
ht
->
table
);
if
(
ht
->
table
!=
&
ht
->
perfect_bit
)
free
((
void
*
)
ht
->
table
);
free
((
void
*
)
ht
);
}
...
...
@@ -169,8 +164,8 @@ static COLD bool double_table(struct htable *ht)
return
false
;
}
ht
->
bits
++
;
ht
->
max
*=
2
;
ht
->
max_with_deleted
*=
2
;
ht
->
max
=
((
size_t
)
3
<<
ht
->
bits
)
/
4
;
ht
->
max_with_deleted
=
((
size_t
)
9
<<
ht
->
bits
)
/
10
;
/* If we lost our "perfect bit", get it back now. */
if
(
!
ht
->
perfect_bit
&&
ht
->
common_mask
)
{
...
...
@@ -182,14 +177,16 @@ static COLD bool double_table(struct htable *ht)
}
}
for
(
i
=
0
;
i
<
oldnum
;
i
++
)
{
if
(
entry_is_valid
(
e
=
oldtable
[
i
]))
{
void
*
p
=
get_raw_ptr
(
ht
,
e
);
ht_add
(
ht
,
p
,
ht
->
rehash
(
p
,
ht
->
priv
));
if
(
oldtable
!=
&
ht
->
perfect_bit
)
{
for
(
i
=
0
;
i
<
oldnum
;
i
++
)
{
if
(
entry_is_valid
(
e
=
oldtable
[
i
]))
{
void
*
p
=
get_raw_ptr
(
ht
,
e
);
ht_add
(
ht
,
p
,
ht
->
rehash
(
p
,
ht
->
priv
));
}
}
free
(
oldtable
);
}
ht
->
deleted
=
0
;
free
(
oldtable
);
return
true
;
}
...
...
ccan/htable/test/run-size.c
0 → 100644
View file @
45f24da3
#include <ccan/htable/htable.h>
#include <ccan/htable/htable.c>
#include <ccan/tap/tap.h>
#include <stdbool.h>
#include <string.h>
#define NUM_VALS 512
/* We use the number divided by two as the hash (for lots of
collisions). */
static
size_t
hash
(
const
void
*
elem
,
void
*
unused
)
{
size_t
h
=
*
(
uint64_t
*
)
elem
/
2
;
return
h
;
}
int
main
(
int
argc
,
char
*
argv
[])
{
struct
htable
*
ht
;
uint64_t
val
[
NUM_VALS
];
unsigned
int
i
;
plan_tests
((
NUM_VALS
)
*
2
);
for
(
i
=
0
;
i
<
NUM_VALS
;
i
++
)
val
[
i
]
=
i
;
ht
=
htable_new
(
hash
,
NULL
);
for
(
i
=
0
;
i
<
NUM_VALS
;
i
++
)
{
ok1
(
ht
->
max
>=
i
);
ok1
(
ht
->
max
<=
i
*
2
);
htable_add
(
ht
,
hash
(
&
val
[
i
],
NULL
),
&
val
[
i
]);
}
htable_free
(
ht
);
return
exit_status
();
}
ccan/htable/test/run-type.c
View file @
45f24da3
...
...
@@ -4,7 +4,8 @@
#include <stdbool.h>
#include <string.h>
#define NUM_VALS (1 << HTABLE_BASE_BITS)
#define NUM_BITS 7
#define NUM_VALS (1 << NUM_BITS)
struct
obj
{
/* Makes sure we don't try to treat and obj as a key or vice versa */
...
...
@@ -23,7 +24,7 @@ static const unsigned int *objkey(const struct obj *obj)
static
size_t
objhash
(
const
unsigned
int
*
key
)
{
size_t
h
=
*
key
/
2
;
h
|=
-
1UL
<<
HTABLE_BASE
_BITS
;
h
|=
-
1UL
<<
NUM
_BITS
;
return
h
;
}
...
...
@@ -121,15 +122,15 @@ int main(int argc, char *argv[])
dne
=
i
;
ht
=
htable_obj_new
();
ok1
(((
struct
htable
*
)
ht
)
->
max
<
(
1
<<
((
struct
htable
*
)
ht
)
->
bits
)
);
ok1
(((
struct
htable
*
)
ht
)
->
bits
==
HTABLE_BASE_BITS
);
ok1
(((
struct
htable
*
)
ht
)
->
max
==
0
);
ok1
(((
struct
htable
*
)
ht
)
->
bits
==
0
);
/* We cannot find an entry which doesn't exist. */
ok1
(
!
htable_obj_get
(
ht
,
&
dne
));
/* Fill it, it should increase in size
(once)
. */
/* Fill it, it should increase in size. */
add_vals
(
ht
,
val
,
NUM_VALS
);
ok1
(((
struct
htable
*
)
ht
)
->
bits
==
HTABLE_BASE
_BITS
+
1
);
ok1
(((
struct
htable
*
)
ht
)
->
bits
==
NUM
_BITS
+
1
);
ok1
(((
struct
htable
*
)
ht
)
->
max
<
(
1
<<
((
struct
htable
*
)
ht
)
->
bits
));
/* Mask should be set. */
...
...
ccan/htable/test/run.c
View file @
45f24da3
...
...
@@ -4,7 +4,8 @@
#include <stdbool.h>
#include <string.h>
#define NUM_VALS (1 << HTABLE_BASE_BITS)
#define NUM_BITS 7
#define NUM_VALS (1 << NUM_BITS)
/* We use the number divided by two as the hash (for lots of
collisions), plus set all the higher bits so we can detect if they
...
...
@@ -12,7 +13,7 @@
static
size_t
hash
(
const
void
*
elem
,
void
*
unused
)
{
size_t
h
=
*
(
uint64_t
*
)
elem
/
2
;
h
|=
-
1UL
<<
HTABLE_BASE
_BITS
;
h
|=
-
1UL
<<
NUM
_BITS
;
return
h
;
}
...
...
@@ -22,11 +23,12 @@ static bool objcmp(const void *htelem, void *cmpdata)
}
static
void
add_vals
(
struct
htable
*
ht
,
const
uint64_t
val
[],
unsigned
int
num
)
const
uint64_t
val
[],
unsigned
int
off
,
unsigned
int
num
)
{
uint64_t
i
;
for
(
i
=
0
;
i
<
num
;
i
++
)
{
for
(
i
=
off
;
i
<
off
+
num
;
i
++
)
{
if
(
htable_get
(
ht
,
hash
(
&
i
,
NULL
),
objcmp
,
&
i
))
{
fail
(
"%llu already in hash"
,
(
long
long
)
i
);
return
;
...
...
@@ -103,27 +105,39 @@ int main(int argc, char *argv[])
void
*
p
;
struct
htable_iter
iter
;
plan_tests
(
2
3
);
plan_tests
(
2
9
);
for
(
i
=
0
;
i
<
NUM_VALS
;
i
++
)
val
[
i
]
=
i
;
dne
=
i
;
ht
=
htable_new
(
hash
,
NULL
);
ok1
(
ht
->
max
<
(
1
<<
ht
->
bits
)
);
ok1
(
ht
->
bits
==
HTABLE_BASE_BITS
);
ok1
(
ht
->
max
==
0
);
ok1
(
ht
->
bits
==
0
);
/* We cannot find an entry which doesn't exist. */
ok1
(
!
htable_get
(
ht
,
hash
(
&
dne
,
NULL
),
objcmp
,
&
dne
));
/* Fill it, it should increase in size (once). */
add_vals
(
ht
,
val
,
NUM_VALS
);
ok1
(
ht
->
bits
==
HTABLE_BASE_BITS
+
1
);
ok1
(
ht
->
max
<
(
1
<<
ht
->
bits
));
/* This should increase it once. */
add_vals
(
ht
,
val
,
0
,
1
);
ok1
(
ht
->
bits
==
1
);
ok1
(
ht
->
max
==
1
);
ok1
(
ht
->
common_mask
==
-
1
);
/* Mask should be set. */
ok1
(
check_mask
(
ht
,
val
,
1
));
/* This should increase it again. */
add_vals
(
ht
,
val
,
1
,
1
);
ok1
(
ht
->
bits
==
2
);
ok1
(
ht
->
max
==
3
);
/* Mask should be set. */
ok1
(
ht
->
common_mask
!=
0
);
ok1
(
ht
->
common_mask
!=
-
1
);
ok1
(
check_mask
(
ht
,
val
,
NUM_VALS
));
ok1
(
check_mask
(
ht
,
val
,
2
));
/* Now do the rest. */
add_vals
(
ht
,
val
,
2
,
NUM_VALS
-
2
);
/* Find all. */
find_vals
(
ht
,
val
,
NUM_VALS
);
...
...
@@ -148,7 +162,7 @@ int main(int argc, char *argv[])
htable_del
(
ht
,
0
,
(
void
*
)
~
(
uintptr_t
)
&
val
[
NUM_VALS
-
1
]);
/* Add the rest. */
add_vals
(
ht
,
val
,
NUM_VALS
-
1
);
add_vals
(
ht
,
val
,
0
,
NUM_VALS
-
1
);
/* Check we can find them all. */
find_vals
(
ht
,
val
,
NUM_VALS
);
...
...
@@ -167,7 +181,7 @@ int main(int argc, char *argv[])
htable_del
(
ht
,
0
,
(
void
*
)((
uintptr_t
)
&
val
[
NUM_VALS
-
1
]
|
perfect_bit
));
/* Enlarging should restore it... */
add_vals
(
ht
,
val
,
NUM_VALS
-
1
);
add_vals
(
ht
,
val
,
0
,
NUM_VALS
-
1
);
ok1
(
ht
->
perfect_bit
!=
0
);
htable_free
(
ht
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment