perfmon: top down level 1 support

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

diff --git a/src/plugins/perfmon/perfmon.c b/src/plugins/perfmon/perfmon.c
index 316e7a5..46c8cf9 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;
@@ -193,6 +193,7 @@ perfmon_set (vlib_main_t *vm, perfmon_bundle_t *b)
        {
          perfmon_thread_runtime_t *rt;
          rt = vec_elt_at_index (pm->thread_runtimes, i);
+         rt->bundle = b;
          rt->n_events = b->n_events;
          rt->n_nodes = n_nodes;
          vec_validate_aligned (rt->node_stats, n_nodes - 1,
@@ -212,17 +213,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,
@@ -232,14 +236,25 @@ perfmon_start (vlib_main_t *vm)
          return clib_error_return_unix (0, "ioctl(PERF_EVENT_IOC_ENABLE)");
        }
     }
-  if (pm->active_bundle->type == PERFMON_BUNDLE_TYPE_NODE)
+  if (b->type == PERFMON_BUNDLE_TYPE_NODE)
     {
+
+      vlib_node_function_t *funcs[PERFMON_OFFSET_TYPE_MAX];
+#define _(type, pfunc) funcs[type] = pfunc;
+
+      foreach_permon_offset_type
+#undef _
+
+       ASSERT (funcs[b->offset_type]);
+
       for (int i = 0; i < vlib_get_n_threads (); i++)
        vlib_node_set_dispatch_wrapper (vlib_get_main_by_index (i),
-                                       perfmon_dispatch_wrapper);
+                                       funcs[b->offset_type]);
     }
+
   pm->sample_time = vlib_time_now (vm);
   pm->is_running = 1;
+
   return 0;
 }