diff options
| -rw-r--r-- | build-data/packages/gmod.mk | 4 | ||||
| -rw-r--r-- | gmod/gmod/mod_vpp.c | 4 | ||||
| -rw-r--r-- | vpp/api/gmon.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/build-data/packages/gmod.mk b/build-data/packages/gmod.mk index 62b31d42be5..3f9a9f7f1fe 100644 --- a/build-data/packages/gmod.mk +++ b/build-data/packages/gmod.mk @@ -1,9 +1,9 @@ gmod_configure_depend = vppinfra-install svm-install -gmod_configure_args = # --libdir=$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/ganglia +gmod_configure_args = --libdir=$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/ganglia gmod_CPPFLAGS = $(call installed_includes_fn, vppinfra svm) -gmod_CPPFLAGS += -I/usr/include/apr-1.0 +gmod_CPPFLAGS += -I/usr/include/apr-1.0 -I/usr/include gmod_LDFLAGS = $(call installed_libs_fn, vppinfra svm) gmod_image_include = echo $(arch_lib_dir)/ganglia/libgmodvpp.so etc diff --git a/gmod/gmod/mod_vpp.c b/gmod/gmod/mod_vpp.c index 951d3528aa0..c28f1a51c59 100644 --- a/gmod/gmod/mod_vpp.c +++ b/gmod/gmod/mod_vpp.c @@ -75,7 +75,7 @@ static g_val_t vpp_metric_handler (int metric_index) switch (metric_index) { case 0: vector_ratep = svmdb_local_get_vec_variable - (svmdb_client, "vlib_vector_rate", sizeof (*vector_ratep)); + (svmdb_client, "vpp_vector_rate", sizeof (*vector_ratep)); if (vector_ratep) { val.d = *vector_ratep; vec_free (vector_ratep); @@ -100,7 +100,7 @@ static g_val_t vpp_metric_handler (int metric_index) case 2: vpp_rx_ratep = svmdb_local_get_vec_variable - (svmdb_client, "vnet_input_rate", sizeof (*vector_ratep)); + (svmdb_client, "vpp_input_rate", sizeof (*vector_ratep)); if (vpp_rx_ratep) { val.d = *vpp_rx_ratep; vec_free (vpp_rx_ratep); diff --git a/vpp/api/gmon.c b/vpp/api/gmon.c index e256e83b370..7d12d64c9eb 100644 --- a/vpp/api/gmon.c +++ b/vpp/api/gmon.c @@ -116,18 +116,18 @@ gmon_init (vlib_main_t *vm) /* 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); @@ -135,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; } |