diff options
| author | Kimplul <kimi.h.kuparinen@gmail.com> | 2025-03-22 16:04:58 +0200 |
|---|---|---|
| committer | Kimplul <kimi.h.kuparinen@gmail.com> | 2025-03-22 16:04:58 +0200 |
| commit | 56edd66ae3e8661d40d499bd7c72f3ffc7aac4e7 (patch) | |
| tree | d2a99da089e9ec6c7e611c64376dae8a05d524a1 | |
| parent | 2d186619c6aefac9d006a360a508f94dfe1c331c (diff) | |
| download | conts-56edd66ae3e8661d40d499bd7c72f3ffc7aac4e7.tar.gz conts-56edd66ae3e8661d40d499bd7c72f3ffc7aac4e7.zip | |
fix map iteration
| -rw-r--r-- | include/conts/map.h | 6 | ||||
| -rw-r--r-- | tests/map.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/conts/map.h b/include/conts/map.h index 5ffdff1..0d30897 100644 --- a/include/conts/map.h +++ b/include/conts/map.h @@ -197,14 +197,14 @@ static inline struct MAP_TUPLE *MAP(find_next)(struct MAP_BUCKET *bucket, struct { struct MAP_NODE *node = CONTAINER_OF(tuple, struct MAP_NODE, t); size_t idx = node - bucket->nodes; - for (idx += 1; idx < bucket->size; ++idx) { + for (; idx < bucket->size; ++idx) { struct MAP_NODE *candidate = &bucket->nodes[idx]; if (candidate->bucket) return &candidate->t; } struct MAP_BUCKET *next = bucket->next; - if (next) + if (!next) return NULL; return MAP(find_next)(next, &next->nodes[0].t); @@ -222,7 +222,7 @@ static inline struct MAP_TUPLE *MAP(begin)(struct MAP_ROOT *root) static inline struct MAP_TUPLE *MAP(next)(struct MAP_TUPLE *t) { struct MAP_NODE *node = CONTAINER_OF(t, struct MAP_NODE, t); - return MAP(find_next)(node->bucket, t); + return MAP(find_next)(node->bucket, &(node + 1)->t); } static inline bool MAP(end)(struct MAP_ROOT *root, struct MAP_TUPLE *t) diff --git a/tests/map.c b/tests/map.c index 08f831e..6c42787 100644 --- a/tests/map.c +++ b/tests/map.c @@ -23,10 +23,14 @@ int main() assert(v && *v == i); } + size_t count = 0; foreach(ints, iter, &ints) { assert(iter->key == iter->data); + count++; } + assert(count == 1000000); + for (int i = 0; i < 1000000; ++i) { ints_remove(&ints, i); } |