X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fgmon.c;h=044410f734b016169a37a6fdbda3c4fab620d1e0;hb=6ca2ac3f80bc9c99d22e90e775a2e986cd0e6176;hp=20deb6a279223b5d30a274a32f5bf2dcdd283d85;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vpp/api/gmon.c b/src/vpp/api/gmon.c
index 20deb6a2792..044410f734b 100644
--- a/src/vpp/api/gmon.c
+++ b/src/vpp/api/gmon.c
@@ -59,17 +59,9 @@ typedef struct
 
 } gmon_main_t;
 
-#if DPDK == 0
-static inline u64
-vnet_get_aggregate_rx_packets (void)
-{
-  return 0;
-}
-#else
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
-#include <vnet/devices/dpdk/dpdk.h>
-#endif
+#include <vnet/devices/devices.h>
 
 gmon_main_t gmon_main;
 
@@ -130,13 +122,8 @@ 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);
 
-  if (vec_len (vlib_mains) == 0)
-    vec_add1 (gm->my_vlib_mains, &vlib_global_main);
-  else
-    {
-      for (i = 0; i < vec_len (vlib_mains); i++)
-	vec_add1 (gm->my_vlib_mains, vlib_mains[i]);
-    }
+  for (i = 0; i < vec_len (vlib_mains); i++)
+    vec_add1 (gm->my_vlib_mains, vlib_mains[i]);
 
   while (1)
     {
@@ -171,7 +158,7 @@ static clib_error_t *
 gmon_init (vlib_main_t * vm)
 {
   gmon_main_t *gm = &gmon_main;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   pid_t *swp = 0;
   f64 *v = 0;
   clib_error_t *error;
@@ -185,7 +172,7 @@ gmon_init (vlib_main_t * vm)
 
   gm->vlib_main = vm;
 
-  memset (ma, 0, sizeof (*ma));
+  clib_memset (ma, 0, sizeof (*ma));
   ma->root_path = am->root_path;
   ma->uid = am->api_uid;
   ma->gid = am->api_gid;