mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

cmap: use multi-variable iterators.

Browse Source 
Re-write cmap's loops using multi-variable helpers.

For iterators based on cmap_cursor, we just need to make sure the NODE
variable is not used after the loop, so we set it to NULL.

Acked-by: Eelco Chaudron <echaudro@redhat.com>
Acked-by: Dumitru Ceara <dceara@redhat.com>
Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Adrian Moreno 2022-03-23 12:56:18 +01:00 committed by Ilya Maximets
parent 9e56549c2b
commit ef39616486
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/cmap.h
View File

@ -108,6 +108,8 @@ size_t cmap_replace(struct cmap *, struct cmap_node *old_node,
* *
* CMAP and HASH are evaluated only once. NODE is evaluated many times. * CMAP and HASH are evaluated only once. NODE is evaluated many times.
* *
* After a normal exit of the loop (not through a "break;" statement) NODE is
* NULL.
* *
* Thread-safety * Thread-safety
* ============= * =============
@ -128,15 +130,15 @@ size_t cmap_replace(struct cmap *, struct cmap_node *old_node,
* CMAP_FOR_EACH_WITH_HASH_PROTECTED may only be used if CMAP is guaranteed not * CMAP_FOR_EACH_WITH_HASH_PROTECTED may only be used if CMAP is guaranteed not
* to change during iteration. It may be very slightly faster. * to change during iteration. It may be very slightly faster.
*/ */
#define CMAP_NODE_FOR_EACH(NODE, MEMBER, CMAP_NODE) \ #define CMAP_NODE_FOR_EACH(NODE, MEMBER, CMAP_NODE) \
for (INIT_CONTAINER(NODE, CMAP_NODE, MEMBER); \ for (INIT_MULTIVAR(NODE, MEMBER, CMAP_NODE, struct cmap_node); \
(NODE) != OBJECT_CONTAINING(NULL, NODE, MEMBER); \ CONDITION_MULTIVAR(NODE, MEMBER, ITER_VAR(NODE) != NULL); \
ASSIGN_CONTAINER(NODE, cmap_node_next(&(NODE)->MEMBER), MEMBER)) UPDATE_MULTIVAR(NODE, cmap_node_next(ITER_VAR(NODE))))
#define CMAP_NODE_FOR_EACH_PROTECTED(NODE, MEMBER, CMAP_NODE) \ #define CMAP_NODE_FOR_EACH_PROTECTED(NODE, MEMBER, CMAP_NODE) \
for (INIT_CONTAINER(NODE, CMAP_NODE, MEMBER); \ for (INIT_MULTIVAR(NODE, MEMBER, CMAP_NODE, struct cmap_node); \
(NODE) != OBJECT_CONTAINING(NULL, NODE, MEMBER); \ CONDITION_MULTIVAR(NODE, MEMBER, ITER_VAR(NODE) != NULL); \
ASSIGN_CONTAINER(NODE, cmap_node_next_protected(&(NODE)->MEMBER), \ UPDATE_MULTIVAR(NODE, cmap_node_next_protected(ITER_VAR(NODE))))
MEMBER))
#define CMAP_FOR_EACH_WITH_HASH(NODE, MEMBER, HASH, CMAP) \ #define CMAP_FOR_EACH_WITH_HASH(NODE, MEMBER, HASH, CMAP) \
CMAP_NODE_FOR_EACH(NODE, MEMBER, cmap_find(CMAP, HASH)) CMAP_NODE_FOR_EACH(NODE, MEMBER, cmap_find(CMAP, HASH))
#define CMAP_FOR_EACH_WITH_HASH_PROTECTED(NODE, MEMBER, HASH, CMAP) \ #define CMAP_FOR_EACH_WITH_HASH_PROTECTED(NODE, MEMBER, HASH, CMAP) \
@ -223,7 +225,7 @@ unsigned long cmap_find_batch(const struct cmap *cmap, unsigned long map,
? (INIT_CONTAINER(NODE, (CURSOR)->node, MEMBER), \ ? (INIT_CONTAINER(NODE, (CURSOR)->node, MEMBER), \
cmap_cursor_advance(CURSOR), \ cmap_cursor_advance(CURSOR), \
true) \ true) \
: false) : (NODE = NULL, false))
#define CMAP_CURSOR_FOR_EACH(NODE, MEMBER, CURSOR, CMAP) \ #define CMAP_CURSOR_FOR_EACH(NODE, MEMBER, CURSOR, CMAP) \
for (*(CURSOR) = cmap_cursor_start(CMAP); \ for (*(CURSOR) = cmap_cursor_start(CMAP); \

3
tests/test-cmap.c
View File

@ -74,6 +74,7 @@ check_cmap(struct cmap *cmap, const int values[], size_t n,
cmap_values[i++] = e->value; cmap_values[i++] = e->value;
} }
assert(i == n); assert(i == n);
assert(e == NULL);
/* Here we test iteration with cmap_next_position() */ /* Here we test iteration with cmap_next_position() */
i = 0; i = 0;
@ -107,6 +108,7 @@ check_cmap(struct cmap *cmap, const int values[], size_t n,
count += e->value == values[i]; count += e->value == values[i];
} }
assert(count == 1); assert(count == 1);
assert(e == NULL);
} }
/* Check that all the values are there in batched lookup. */ /* Check that all the values are there in batched lookup. */
@ -130,6 +132,7 @@ check_cmap(struct cmap *cmap, const int values[], size_t n,
CMAP_NODE_FOR_EACH (e, node, nodes[k]) { CMAP_NODE_FOR_EACH (e, node, nodes[k]) {
count += e->value == values[i + k]; count += e->value == values[i + k];
} }
assert(e == NULL);
} }
assert(count == j); /* j elements in a batch. */ assert(count == j); /* j elements in a batch. */
} }