perfmon: combined set and start command.

[vpp.git] / src / plugins / perfmon / perfmon.c

diff --git a/src/plugins/perfmon/perfmon.c b/src/plugins/perfmon/perfmon.c
index 316e7a5..f9402f8 100644 (file)
--- a/src/plugins/perfmon/perfmon.c
+++ b/src/plugins/perfmon/perfmon.c
@@ -79,7 +79,7 @@ perfmon_reset (vlib_main_t *vm)
   pm->active_bundle = 0;
 }
 
-clib_error_t *
+static clib_error_t *
 perfmon_set (vlib_main_t *vm, perfmon_bundle_t *b)
 {
   clib_error_t *err = 0;
@@ -212,17 +212,20 @@ error:
 }
 
 clib_error_t *
-perfmon_start (vlib_main_t *vm)
+perfmon_start (vlib_main_t *vm, perfmon_bundle_t *b)
 {
+  clib_error_t *err = 0;
   perfmon_main_t *pm = &perfmon_main;
-  int n_groups = vec_len (pm->group_fds);
-
-  if (n_groups == 0)
-    return clib_error_return (0, "no bundle configured");
+  int n_groups;
 
   if (pm->is_running == 1)
     return clib_error_return (0, "already running");
 
+  if ((err = perfmon_set (vm, b)) != 0)
+    return err;
+
+  n_groups = vec_len (pm->group_fds);
+
   for (int i = 0; i < n_groups; i++)
     {
       if (ioctl (pm->group_fds[i], PERF_EVENT_IOC_ENABLE,
@@ -238,8 +241,10 @@ perfmon_start (vlib_main_t *vm)
        vlib_node_set_dispatch_wrapper (vlib_get_main_by_index (i),
                                        perfmon_dispatch_wrapper);
     }
+
   pm->sample_time = vlib_time_now (vm);
   pm->is_running = 1;
+
   return 0;
 }