summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/vnet/dpo/load_balance_map.c13
-rw-r--r--src/vnet/fib/fib_test.c12
2 files changed, 20 insertions, 5 deletions
diff --git a/src/vnet/dpo/load_balance_map.c b/src/vnet/dpo/load_balance_map.c
index 70ce1bf7c39..4e27e5db3d8 100644
--- a/src/vnet/dpo/load_balance_map.c
+++ b/src/vnet/dpo/load_balance_map.c
@@ -415,6 +415,14 @@ load_balance_map_init (load_balance_map_t *lbm,
return (lbm);
}
+static void
+load_balance_map_destroy (load_balance_map_t *lbm)
+{
+ vec_free(lbm->lbm_paths);
+ vec_free(lbm->lbm_buckets);
+ pool_put(load_balance_map_pool, lbm);
+}
+
index_t
load_balance_map_add_or_lock (u32 n_buckets,
u32 sum_of_weights,
@@ -434,6 +442,7 @@ load_balance_map_add_or_lock (u32 n_buckets,
else
{
lbm = load_balance_map_get(lbmi);
+ load_balance_map_destroy(tmp);
}
lbm->lbm_locks++;
@@ -468,9 +477,7 @@ load_balance_map_unlock (index_t lbmi)
if (0 == lbm->lbm_locks)
{
load_balance_map_db_remove(lbm);
- vec_free(lbm->lbm_paths);
- vec_free(lbm->lbm_buckets);
- pool_put(load_balance_map_pool, lbm);
+ load_balance_map_destroy(lbm);
}
}
diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c
index eb6fe1617e7..baf66738ef6 100644
--- a/src/vnet/fib/fib_test.c
+++ b/src/vnet/fib/fib_test.c
@@ -585,6 +585,7 @@ fib_test_v4 (void)
const load_balance_t *lb;
test_main_t *tm;
u32 fib_index;
+ int lb_count;
int ii;
/* via 10.10.10.1 */
@@ -598,6 +599,9 @@ fib_test_v4 (void)
tm = &test_main;
+ /* record the nubmer of load-balances in use before we start */
+ lb_count = pool_elts(load_balance_pool);
+
/* Find or create FIB table 11 */
fib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_IP4, 11);
@@ -3022,7 +3026,7 @@ fib_test_v4 (void)
"LB maps's bucket 1 is %d",
lbm->lbm_buckets[1]);
- load_balance_map_unlock(lb->lb_map);
+ load_balance_map_unlock(lbmi);
/*
* add it back. again
@@ -3117,7 +3121,7 @@ fib_test_v4 (void)
"LB Map for 200.200.200.200/32 at %d is %d",
ii, lbm->lbm_buckets[ii]);
}
-
+ load_balance_map_unlock(lbmi);
/*
* tidy up
@@ -3718,6 +3722,10 @@ fib_test_v4 (void)
fib_entry_pool_size());
FIB_TEST((ENBR-5 == pool_elts(fib_urpf_list_pool)), "uRPF pool size is %d",
pool_elts(fib_urpf_list_pool));
+ FIB_TEST((0 == pool_elts(load_balance_map_pool)), "LB-map pool size is %d",
+ pool_elts(load_balance_map_pool));
+ FIB_TEST((lb_count == pool_elts(load_balance_pool)), "LB pool size is %d",
+ pool_elts(load_balance_pool));
return 0;
}