Add config option to use dlmalloc instead of mheap

[vpp.git] / src / plugins / acl / hash_lookup.c

diff --git a/src/plugins/acl/hash_lookup.c b/src/plugins/acl/hash_lookup.c
index ea07fad..dcc5f79 100644 (file)
--- a/src/plugins/acl/hash_lookup.c
+++ b/src/plugins/acl/hash_lookup.c
@@ -265,13 +265,14 @@ tm_assign_mask_type_index(acl_main_t *am, fa_5tuple_t *mask, int is_ip6, u32 lc_
        u32 mask_type_index = ~0;
        u32 for_mask_type_index = ~0;
        ace_mask_type_entry_t *mte;
+       int order_index;
        /* look for existing mask comparable with the one in input */
 
        hash_applied_mask_info_t **hash_applied_mask_info_vec = vec_elt_at_index(am->hash_applied_mask_info_vec_by_lc_index, lc_index);
        hash_applied_mask_info_t *minfo;
 
         if (vec_len(*hash_applied_mask_info_vec) > 0) {
-           for(int order_index = vec_len((*hash_applied_mask_info_vec)) -1; order_index >= 0; order_index--) {
+           for(order_index = vec_len((*hash_applied_mask_info_vec)) -1; order_index >= 0; order_index--) {
                minfo = vec_elt_at_index((*hash_applied_mask_info_vec), order_index);
                for_mask_type_index = minfo->mask_type_index;
                mte = vec_elt_at_index(am->ace_mask_type_pool, for_mask_type_index);
@@ -557,12 +558,13 @@ static void *
 hash_acl_set_heap(acl_main_t *am)
 {
   if (0 == am->hash_lookup_mheap) {
-    am->hash_lookup_mheap = mheap_alloc (0 /* use VM */ , am->hash_lookup_mheap_size);
+    am->hash_lookup_mheap = mheap_alloc_with_lock (0 /* use VM */ , 
+                                                   am->hash_lookup_mheap_size,
+                                                   1 /* locked */);
     if (0 == am->hash_lookup_mheap) {
-      clib_error("ACL plugin failed to allocate hash lookup heap of %U bytes, abort", format_memory_size, am->hash_lookup_mheap_size);
+        clib_error("ACL plugin failed to allocate lookup heap of %U bytes", 
+                   format_memory_size, am->hash_lookup_mheap_size);
     }
-    mheap_t *h = mheap_header (am->hash_lookup_mheap);
-    h->flags |= MHEAP_FLAG_THREAD_SAFE;
   }
   void *oldheap = clib_mem_set_heap(am->hash_lookup_mheap);
   return oldheap;
@@ -573,6 +575,7 @@ acl_plugin_hash_acl_set_validate_heap(int on)
 {
   acl_main_t *am = &acl_main;
   clib_mem_set_heap(hash_acl_set_heap(am));
+#if USE_DLMALLOC == 0
   mheap_t *h = mheap_header (am->hash_lookup_mheap);
   if (on) {
     h->flags |= MHEAP_FLAG_VALIDATE;
@@ -582,6 +585,7 @@ acl_plugin_hash_acl_set_validate_heap(int on)
     h->flags &= ~MHEAP_FLAG_VALIDATE;
     h->flags |= MHEAP_FLAG_SMALL_OBJECT_CACHE;
   }
+#endif
 }
 
 void
@@ -589,12 +593,14 @@ acl_plugin_hash_acl_set_trace_heap(int on)
 {
   acl_main_t *am = &acl_main;
   clib_mem_set_heap(hash_acl_set_heap(am));
+#if USE_DLMALLOC == 0
   mheap_t *h = mheap_header (am->hash_lookup_mheap);
   if (on) {
     h->flags |= MHEAP_FLAG_TRACE;
   } else {
     h->flags &= ~MHEAP_FLAG_TRACE;
   }
+#endif
 }
 
 static void