From 88caf28354133160d2446e939f1e54adb71cc144 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Wed, 16 Sep 2020 12:10:27 +0000 Subject: acl: remove custom ACL-plugin heap Custom ACL-plugin heap was useful in early stages, but it interferes with other infra optimizations. Remove it and use global heap. Change-Id: I2300548f1d1798dec27bc5a2a41cf37f9fcda95d Type: improvement Signed-off-by: Andrew Yourtchenko --- src/plugins/acl/lookup_context.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/plugins/acl/lookup_context.c') diff --git a/src/plugins/acl/lookup_context.c b/src/plugins/acl/lookup_context.c index 28fa9eeaef5..5344975402e 100644 --- a/src/plugins/acl/lookup_context.c +++ b/src/plugins/acl/lookup_context.c @@ -197,7 +197,6 @@ static void acl_plugin_put_lookup_context_index (u32 lc_index) return; } - void *oldheap = acl_plugin_set_heap (); acl_lookup_context_t *acontext = pool_elt_at_index(am->acl_lookup_contexts, lc_index); u32 index = vec_search(am->acl_users[acontext->context_user_id].lookup_contexts, lc_index); @@ -208,7 +207,6 @@ static void acl_plugin_put_lookup_context_index (u32 lc_index) unlock_acl_vec(lc_index, acontext->acl_indices); vec_free(acontext->acl_indices); pool_put(am->acl_lookup_contexts, acontext); - clib_mem_set_heap (oldheap); } /* @@ -233,8 +231,6 @@ static int acl_plugin_set_acl_vec_for_context (u32 lc_index, u32 *acl_list) clib_warning("BUG: lc_index %d is not valid", lc_index); return -1; } - void *oldheap = acl_plugin_set_heap (); - vec_foreach (pacln, acl_list) { if (pool_is_free_index (am->acls, *pacln)) @@ -267,7 +263,6 @@ static int acl_plugin_set_acl_vec_for_context (u32 lc_index, u32 *acl_list) done: clib_bitmap_free (seen_acl_bitmap); - clib_mem_set_heap (oldheap); return rv; } -- cgit 1.2.3-korg