Rationalize metric names.

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

diff --git a/vpp/api/gmon.c b/vpp/api/gmon.c
index 75bf344..7d12d64 100644 (file)
--- a/vpp/api/gmon.c
+++ b/vpp/api/gmon.c
@@ -35,6 +35,8 @@
 #include <vppinfra/heap.h>
 #include <vppinfra/pool.h>
 #include <vppinfra/format.h>
+#include <vlibapi/api.h>
+#include <vlibmemory/api.h>
 
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
@@ -104,27 +106,28 @@ static clib_error_t *
 gmon_init (vlib_main_t *vm)
 {
     gmon_main_t *gm = &gmon_main;
+    api_main_t * am = &api_main;
     pid_t *swp = 0;
     f64 *v = 0;
 
     gm->vlib_main = vm;
-    gm->svmdb_client = svmdb_map();
+    gm->svmdb_client = svmdb_map_chroot(am->root_path);
 
     /* Find or create, set to zero */
     vec_add1 (v, 0.0);
     svmdb_local_set_vec_variable(gm->svmdb_client, 
-                                 "vlib_vector_rate", 
+                                 "vpp_vector_rate", 
                                  (char *)v, sizeof (*v));
     vec_free(v);
     vec_add1 (v, 0.0);
     svmdb_local_set_vec_variable(gm->svmdb_client, 
-                                 "vnet_input_rate", 
+                                 "vpp_input_rate", 
                                  (char *)v, sizeof (*v));
     vec_free(v);
 
     vec_add1 (swp, 0.0);
     svmdb_local_set_vec_variable(gm->svmdb_client, 
-                                 "vpef_pid", 
+                                 "vpp_pid", 
                                  (char *)swp, sizeof (*swp));
     vec_free(swp);
 
@@ -132,15 +135,15 @@ gmon_init (vlib_main_t *vm)
     gm->vector_rate_ptr = 
         svmdb_local_get_variable_reference (gm->svmdb_client,
                                             SVMDB_NAMESPACE_VEC, 
-                                            "vlib_vector_rate");
+                                            "vpp_vector_rate");
     gm->input_rate_ptr = 
         svmdb_local_get_variable_reference (gm->svmdb_client,
                                             SVMDB_NAMESPACE_VEC, 
-                                            "vnet_input_rate");
+                                            "vpp_input_rate");
     gm->vpef_pid_ptr = 
         svmdb_local_get_variable_reference (gm->svmdb_client,
                                             SVMDB_NAMESPACE_VEC, 
-                                            "vpef_pid");
+                                            "vpp_pid");
     return 0;
 }