diff options
| author |   Dave Barach <dbarach@cisco.com> | 2016-03-23 08:56:01 -0400 |
|---|---|---|
| committer |   Damjan Marion <damarion@cisco.com> | 2016-03-29 12:46:42 +0200 |
| commit | b2ef4dde97b51b73a596093f06cbbdb84f23a824 (patch) | |
| tree | d769ea2540f22d44ca21aaceeb1970ad2fe33844 /vnet/vnet/ip/ip4_mtrie.c | |
| parent | 3c79e65bd65d574b3f1fefb964101c1f2927369e (diff) | |
Adjacency allocator
Change-Id: Ieacbfa4dbbfd13b38eaa2d37f618f212cef4e492
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet/vnet/ip/ip4_mtrie.c')
| -rw-r--r-- | vnet/vnet/ip/ip4_mtrie.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/vnet/vnet/ip/ip4_mtrie.c b/vnet/vnet/ip/ip4_mtrie.c index ed4a0d9f44f..461cd64b86d 100644 --- a/vnet/vnet/ip/ip4_mtrie.c +++ b/vnet/vnet/ip/ip4_mtrie.c @@ -191,7 +191,8 @@ set_ply_with_more_specific_leaf (ip4_fib_mtrie_t * m, /* Replace less specific terminal leaves with new leaf. */ else if (new_leaf_dst_address_bits >= ply->dst_address_bits_of_leaves[i]) { - ply->leaves[i] = new_leaf; + __sync_val_compare_and_swap (&ply->leaves[i], old_leaf, new_leaf); + ASSERT(ply->leaves[i] == new_leaf); ply->dst_address_bits_of_leaves[i] = new_leaf_dst_address_bits; ply->n_non_empty_leafs += ip4_fib_mtrie_leaf_is_empty (old_leaf); } @@ -240,7 +241,9 @@ set_leaf (ip4_fib_mtrie_t * m, if (old_leaf_is_terminal) { old_ply->dst_address_bits_of_leaves[i] = a->dst_address_length; - old_ply->leaves[i] = new_leaf; + __sync_val_compare_and_swap (&old_ply->leaves[i], old_leaf, + new_leaf); + ASSERT(old_ply->leaves[i] == new_leaf); old_ply->n_non_empty_leafs += ip4_fib_mtrie_leaf_is_empty (old_leaf); ASSERT (old_ply->n_non_empty_leafs <= ARRAY_LEN (old_ply->leaves)); } @@ -274,7 +277,9 @@ set_leaf (ip4_fib_mtrie_t * m, /* Refetch since ply_create may move pool. */ old_ply = pool_elt_at_index (m->ply_pool, old_ply_index); - old_ply->leaves[dst_byte] = new_leaf; + __sync_val_compare_and_swap (&old_ply->leaves[dst_byte], old_leaf, + new_leaf); + ASSERT(old_ply->leaves[dst_byte] == new_leaf); old_ply->dst_address_bits_of_leaves[dst_byte] = 0; old_ply->n_non_empty_leafs -= ip4_fib_mtrie_leaf_is_non_empty (old_leaf); |