X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fgmon.c;h=044410f734b016169a37a6fdbda3c4fab620d1e0;hb=7c0eb56f4;hp=277be8c0af865ebe53e1972509bafdcb21b9acd1;hpb=80f54e20270ed0628ee725e3e3c515731a0188f2;p=vpp.git diff --git a/src/vpp/api/gmon.c b/src/vpp/api/gmon.c index 277be8c0af8..044410f734b 100644 --- a/src/vpp/api/gmon.c +++ b/src/vpp/api/gmon.c @@ -132,8 +132,7 @@ gmon_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) *gm->vector_rate_ptr = vector_rate; now = vlib_time_now (vm); dt = now - last_runtime; - // TODO - //input_packets = vnet_get_aggregate_rx_packets (); + input_packets = vnet_get_aggregate_rx_packets (); *gm->input_rate_ptr = (f64) (input_packets - last_input_packets) / dt; last_runtime = now; last_input_packets = input_packets; @@ -159,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; @@ -173,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;