X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fsvm%2Fsvmtool.c;h=6085967429813bffad6147b1fc470a3270bcf600;hb=fa551b889afadda6dcfcc8093f6949f85284b41d;hp=6d1a2b1da49f79dcfe29cf28e03a58f8519e17fb;hpb=b7b929931a07fbb27b43d5cd105f366c3e29807e;p=vpp.git

diff --git a/src/svm/svmtool.c b/src/svm/svmtool.c
index 6d1a2b1da49..60859674298 100644
--- a/src/svm/svmtool.c
+++ b/src/svm/svmtool.c
@@ -35,7 +35,6 @@
 #include <vppinfra/bitmap.h>
 #include <vppinfra/fifo.h>
 #include <vppinfra/time.h>
-#include <vppinfra/mheap.h>
 #include <vppinfra/heap.h>
 #include <vppinfra/pool.h>
 #include <vppinfra/format.h>
@@ -74,10 +73,10 @@ format_all_svm_regions (u8 * s, va_list * args)
    * find_or_create.
    */
   /* *INDENT-OFF* */
-  pool_foreach (subp, mp->subregions, ({
+  pool_foreach (subp, mp->subregions)  {
         name = vec_dup (subp->subregion_name);
         vec_add1(svm_names, name);
-      }));
+      }
   /* *INDENT-ON* */
 
   pthread_mutex_unlock (&root_rp->mutex);
@@ -266,6 +265,7 @@ svm_existing_region_map_nolock (void *root_arg, svm_map_region_args_t * a)
       svm_pop_heap (oldheap);
       return rp;
     }
+  region_unlock (root_rp);
   return 0;
 
 }
@@ -329,10 +329,10 @@ subregion_repair (char *chroot_path)
    * find_or_create.
    */
   /* *INDENT-OFF* */
-  pool_foreach (subp, mp->subregions, ({
+  pool_foreach (subp, mp->subregions)  {
         name = vec_dup (subp->subregion_name);
         vec_add1(svm_names, name);
-      }));
+      }
   /* *INDENT-ON* */
 
   pthread_mutex_unlock (&root_rp->mutex);
@@ -458,6 +458,8 @@ main (int argc, char **argv)
   char *chroot_path = 0;
   u8 *chroot_u8;
 
+  clib_mem_init_thread_safe (0, 128 << 20);
+
   unformat_init_command_line (&input, argv);
 
   while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)