vlib: introduce vlib_get_main_by_index(), vlib_get_n_threads()

[vpp.git] / src / vpp / api / gmon.c

diff --git a/src/vpp/api/gmon.c b/src/vpp/api/gmon.c
index 044410f..ff561ef 100644 (file)
--- a/src/vpp/api/gmon.c
+++ b/src/vpp/api/gmon.c
@@ -31,7 +31,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>
@@ -75,8 +74,8 @@ get_significant_errors (gmon_main_t * gm)
   u64 significant_errors = 0;
 
   /* *INDENT-OFF* */
-  clib_bitmap_foreach (code, gm->sig_error_bitmap,
-  ({
+  clib_bitmap_foreach (code, gm->sig_error_bitmap)
+   {
     for (vm_index = 0; vm_index < vec_len (gm->my_vlib_mains); vm_index++)
       {
         this_vlib_main = gm->my_vlib_mains[vm_index];
@@ -85,7 +84,7 @@ get_significant_errors (gmon_main_t * gm)
           ((vec_len(em->counters_last_clear) > code) ?
            em->counters_last_clear[code] : 0);
       }
-  }));
+  }
   /* *INDENT-ON* */
 
   return (significant_errors);
@@ -122,7 +121,7 @@ gmon_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
   /* Initial wait for the world to settle down */
   vlib_process_suspend (vm, 5.0);
 
-  for (i = 0; i < vec_len (vlib_mains); i++)
+  for (i = 0; i < vlib_get_n_threads (); i++)
     vec_add1 (gm->my_vlib_mains, vlib_mains[i]);
 
   while (1)