#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>
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;
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;