From 2c8e0023f91882e53f06eb99c901b97fe013f981 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Tue, 11 Feb 2020 15:06:34 -0500 Subject: vppinfra: remove the historical mheap memory allocator The mheap allocator has been turned off for several releases. This commit removes the cmake config parameter, parallel support for dlmalloc and mheap, and the mheap allocator itself. Type: refactor Signed-off-by: Dave Barach Change-Id: I104f88a1f06e47e90e5f7fb3e11cd1ca66467903 --- src/vnet/classify/vnet_classify.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/vnet/classify') diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c index bb9e52a0db3..165d4fc0316 100755 --- a/src/vnet/classify/vnet_classify.c +++ b/src/vnet/classify/vnet_classify.c @@ -147,13 +147,9 @@ vnet_classify_new_table (vnet_classify_main_t * cm, t->skip_n_vectors = skip_n_vectors; t->entries_per_page = 2; -#if USE_DLMALLOC == 0 - t->mheap = mheap_alloc (0 /* use VM */ , memory_size); -#else t->mheap = create_mspace (memory_size, 1 /* locked */ ); /* classifier requires the memory to be contiguous, so can not expand. */ mspace_disable_expand (t->mheap); -#endif vec_validate_aligned (t->buckets, nbuckets - 1, CLIB_CACHE_LINE_BYTES); oldheap = clib_mem_set_heap (t->mheap); @@ -180,12 +176,7 @@ vnet_classify_delete_table_index (vnet_classify_main_t * cm, vec_free (t->mask); vec_free (t->buckets); -#if USE_DLMALLOC == 0 - mheap_free (t->mheap); -#else destroy_mspace (t->mheap); -#endif - pool_put (cm->tables, t); } -- cgit 1.2.3-korg