diff options
| -rw-r--r-- | src/plugins/acl/sess_mgmt_node.c | 8 | ||||
| -rw-r--r-- | src/vlib/main.h | 9 | ||||
| -rw-r--r-- | src/vlib/threads.c | 4 | ||||
| -rw-r--r-- | src/vlib/unix/main.c | 4 |
4 files changed, 0 insertions, 25 deletions
diff --git a/src/plugins/acl/sess_mgmt_node.c b/src/plugins/acl/sess_mgmt_node.c index 3fc4f5e1982..f9a3064cbb1 100644 --- a/src/plugins/acl/sess_mgmt_node.c +++ b/src/plugins/acl/sess_mgmt_node.c @@ -860,10 +860,8 @@ acl_fa_enable_disable (u32 sw_if_index, int is_input, int enable_disable) { acl_fa_verify_init_sessions (am); am->fa_total_enabled_count++; - void *oldheap = clib_mem_set_heap (am->vlib_main->heap_base); vlib_process_signal_event (am->vlib_main, am->fa_cleaner_node_index, ACL_FA_CLEANER_RESCHEDULE, 0); - clib_mem_set_heap (oldheap); } else { @@ -874,12 +872,10 @@ acl_fa_enable_disable (u32 sw_if_index, int is_input, int enable_disable) { ASSERT (clib_bitmap_get (am->fa_in_acl_on_sw_if_index, sw_if_index) != enable_disable); - void *oldheap = clib_mem_set_heap (am->vlib_main->heap_base); vnet_feature_enable_disable ("ip4-unicast", "acl-plugin-in-ip4-fa", sw_if_index, enable_disable, 0, 0); vnet_feature_enable_disable ("ip6-unicast", "acl-plugin-in-ip6-fa", sw_if_index, enable_disable, 0, 0); - clib_mem_set_heap (oldheap); am->fa_in_acl_on_sw_if_index = clib_bitmap_set (am->fa_in_acl_on_sw_if_index, sw_if_index, enable_disable); @@ -888,12 +884,10 @@ acl_fa_enable_disable (u32 sw_if_index, int is_input, int enable_disable) { ASSERT (clib_bitmap_get (am->fa_out_acl_on_sw_if_index, sw_if_index) != enable_disable); - void *oldheap = clib_mem_set_heap (am->vlib_main->heap_base); vnet_feature_enable_disable ("ip4-output", "acl-plugin-out-ip4-fa", sw_if_index, enable_disable, 0, 0); vnet_feature_enable_disable ("ip6-output", "acl-plugin-out-ip6-fa", sw_if_index, enable_disable, 0, 0); - clib_mem_set_heap (oldheap); am->fa_out_acl_on_sw_if_index = clib_bitmap_set (am->fa_out_acl_on_sw_if_index, sw_if_index, enable_disable); @@ -905,11 +899,9 @@ acl_fa_enable_disable (u32 sw_if_index, int is_input, int enable_disable) clib_warning ("ENABLE-DISABLE: clean the connections on interface %d", sw_if_index); #endif - void *oldheap = clib_mem_set_heap (am->vlib_main->heap_base); vlib_process_signal_event (am->vlib_main, am->fa_cleaner_node_index, ACL_FA_CLEANER_DELETE_BY_SW_IF_INDEX, sw_if_index); - clib_mem_set_heap (oldheap); } } diff --git a/src/vlib/main.h b/src/vlib/main.h index 2581d491019..1413158ad53 100644 --- a/src/vlib/main.h +++ b/src/vlib/main.h @@ -154,15 +154,6 @@ typedef struct vlib_main_t /* Error marker to use when exiting main loop. */ clib_error_t *main_loop_error; - /* Start of the heap. */ - void *heap_base; - - /* Truncated version, to create frame indices */ - void *heap_aligned_base; - - /* Size of the heap */ - uword heap_size; - /* buffer main structure. */ vlib_buffer_main_t *buffer_main; diff --git a/src/vlib/threads.c b/src/vlib/threads.c index e34ef7c30cb..567ba62891b 100644 --- a/src/vlib/threads.c +++ b/src/vlib/threads.c @@ -638,10 +638,6 @@ start_workers (vlib_main_t * vm) sizeof (*vm_clone)); vm_clone->thread_index = worker_thread_index; - vm_clone->heap_base = w->thread_mheap; - vm_clone->heap_aligned_base = - (void *) (((uword) w->thread_mheap) & - ~(CLIB_CACHE_LINE_BYTES - 1)); vm_clone->pending_rpc_requests = 0; vec_validate (vm_clone->pending_rpc_requests, 0); _vec_len (vm_clone->pending_rpc_requests) = 0; diff --git a/src/vlib/unix/main.c b/src/vlib/unix/main.c index 0ebda240899..0b73597dab3 100644 --- a/src/vlib/unix/main.c +++ b/src/vlib/unix/main.c @@ -708,10 +708,6 @@ vlib_unix_main (int argc, char *argv[]) vgm->exec_path = vgm->name = argv[0]; vgm->argv = (u8 **) argv; - vm->heap_base = clib_mem_get_heap (); - vm->heap_aligned_base = - (void *) (((uword) vm->heap_base) & ~(CLIB_CACHE_LINE_BYTES - 1)); - ASSERT (vm->heap_base); clib_time_init (&vm->clib_time); |