vlib: introduce vlib_get_main_by_index(), vlib_get_n_threads()

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

diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c
index 18e0d06..2a32fbf 100644 (file)
--- a/src/plugins/flowprobe/flowprobe.c
+++ b/src/plugins/flowprobe/flowprobe.c
@@ -26,6 +26,7 @@
 #include <vnet/vnet.h>
 #include <vpp/app/version.h>
 #include <vnet/plugin/plugin.h>
+#include <vnet/udp/udp_local.h>
 #include <flowprobe/flowprobe.h>
 
 #include <vlibapi/api.h>
@@ -655,24 +656,6 @@ out:
   REPLY_MACRO (VL_API_FLOWPROBE_TX_INTERFACE_ADD_DEL_REPLY);
 }
 
-/**
- * @brief API message custom-dump function
- * @param mp vl_api_flowprobe_tx_interface_add_del_t * mp the api message
- * @param handle void * print function handle
- * @returns u8 * output string
- */
-static void *vl_api_flowprobe_tx_interface_add_del_t_print
-  (vl_api_flowprobe_tx_interface_add_del_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: flowprobe_tx_interface_add_del ");
-  s = format (s, "sw_if_index %d is_add %d which %d ",
-             clib_host_to_net_u32 (mp->sw_if_index),
-             (int) mp->is_add, (int) mp->which);
-  FINISH;
-}
-
 #define vec_neg_search(v,E)         \
 ({              \
   word _v(i) = 0;         \
@@ -808,12 +791,12 @@ flowprobe_show_table_fn (vlib_main_t * vm,
   for (i = 0; i < vec_len (fm->pool_per_worker); i++)
     {
       /* *INDENT-OFF* */
-      pool_foreach (e, fm->pool_per_worker[i], (
+      pool_foreach (e, fm->pool_per_worker[i])
        {
          vlib_cli_output (vm, "%U",
                           format_flowprobe_entry,
                           e);
-       }));
+       }
       /* *INDENT-ON* */
 
     }
@@ -1058,13 +1041,13 @@ timer_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
   vec_reset_length (event_data);
 
   int i;
-  if (vec_len (vlib_mains) == 0)
+  if (vlib_get_n_threads () == 0)
     vec_add1 (worker_vms, vm);
   else
     {
-      for (i = 0; i < vec_len (vlib_mains); i++)
+      for (i = 0; i < vlib_get_n_threads (); i++)
        {
-         worker_vm = vlib_mains[i];
+         worker_vm = vlib_get_main_by_index (i);
          if (worker_vm)
            vec_add1 (worker_vms, worker_vm);
        }