classify: vpp packet tracer support

[vpp.git] / src / vlib / trace.c

diff --git a/src/vlib/trace.c b/src/vlib/trace.c
index cfc3bda..7ee1b63 100644 (file)
--- a/src/vlib/trace.c
+++ b/src/vlib/trace.c
@@ -75,14 +75,14 @@ vlib_trace_frame_buffers_only (vlib_main_t * vm,
       if (b0->flags & VLIB_BUFFER_IS_TRACED)
        {
          t0 = vlib_add_trace (vm, node, b0, n_buffer_data_bytes_in_trace);
-         clib_memcpy (t0, b0->data + b0->current_data,
-                      n_buffer_data_bytes_in_trace);
+         clib_memcpy_fast (t0, b0->data + b0->current_data,
+                           n_buffer_data_bytes_in_trace);
        }
       if (b1->flags & VLIB_BUFFER_IS_TRACED)
        {
          t1 = vlib_add_trace (vm, node, b1, n_buffer_data_bytes_in_trace);
-         clib_memcpy (t1, b1->data + b1->current_data,
-                      n_buffer_data_bytes_in_trace);
+         clib_memcpy_fast (t1, b1->data + b1->current_data,
+                           n_buffer_data_bytes_in_trace);
        }
       from += 2;
       n_left -= 2;
@@ -101,8 +101,8 @@ vlib_trace_frame_buffers_only (vlib_main_t * vm,
       if (b0->flags & VLIB_BUFFER_IS_TRACED)
        {
          t0 = vlib_add_trace (vm, node, b0, n_buffer_data_bytes_in_trace);
-         clib_memcpy (t0, b0->data + b0->current_data,
-                      n_buffer_data_bytes_in_trace);
+         clib_memcpy_fast (t0, b0->data + b0->current_data,
+                           n_buffer_data_bytes_in_trace);
        }
       from += 1;
       n_left -= 1;
@@ -131,7 +131,7 @@ clear_trace_buffer (void)
   /* *INDENT-ON* */
 }
 
-static u8 *
+u8 *
 format_vlib_trace (u8 * s, va_list * va)
 {
   vlib_main_t *vm = va_arg (*va, vlib_main_t *);
@@ -351,15 +351,24 @@ VLIB_CLI_COMMAND (show_trace_cli,static) = {
 };
 /* *INDENT-ON* */
 
+int vlib_enable_disable_pkt_trace_filter (int enable) __attribute__ ((weak));
+int
+vlib_enable_disable_pkt_trace_filter (int enable)
+{
+  return 0;
+}
+
 static clib_error_t *
 cli_add_trace_buffer (vlib_main_t * vm,
                      unformat_input_t * input, vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
   vlib_trace_main_t *tm;
+  vlib_node_t *node;
   vlib_trace_node_t *tn;
   u32 node_index, add;
   u8 verbose = 0;
+  int filter = 0;
   clib_error_t *error = 0;
 
   if (!unformat_user (input, unformat_line_input, line_input))
@@ -375,6 +384,8 @@ cli_add_trace_buffer (vlib_main_t * vm,
        ;
       else if (unformat (line_input, "verbose"))
        verbose = 1;
+      else if (unformat (line_input, "filter"))
+       filter = 1;
       else
        {
          error = clib_error_create ("expected NODE COUNT, got `%U'",
@@ -383,6 +394,26 @@ cli_add_trace_buffer (vlib_main_t * vm,
        }
     }
 
+  node = vlib_get_node (vm, node_index);
+
+  if ((node->flags & VLIB_NODE_FLAG_TRACE_SUPPORTED) == 0)
+    {
+      error = clib_error_create ("node '%U' doesn't support per-node "
+                                "tracing. There may be another way to "
+                                "initiate trace on this node.",
+                                format_vlib_node_name, vm, node_index);
+      goto done;
+    }
+
+  if (filter)
+    {
+      if (vlib_enable_disable_pkt_trace_filter (1 /* enable */ ))
+       {
+         error = clib_error_create ("No packet trace filter configured...");
+         goto done;
+       }
+    }
+
   /* *INDENT-OFF* */
   foreach_vlib_main ((
     {
@@ -409,7 +440,6 @@ VLIB_CLI_COMMAND (add_trace_cli,static) = {
 };
 /* *INDENT-ON* */
 
-
 /*
  * Configure a filter for packet traces.
  *
@@ -511,6 +541,7 @@ static clib_error_t *
 cli_clear_trace_buffer (vlib_main_t * vm,
                        unformat_input_t * input, vlib_cli_command_t * cmd)
 {
+  vlib_enable_disable_pkt_trace_filter (0 /* enable */ );
   clear_trace_buffer ();
   return 0;
 }
@@ -529,6 +560,18 @@ vlib_trace_cli_reference (void)
 {
 }
 
+int
+vnet_is_packet_traced (vlib_buffer_t * b,
+                      u32 classify_table_index, int func)
+__attribute__ ((weak));
+
+int
+vnet_is_packet_traced (vlib_buffer_t * b, u32 classify_table_index, int func)
+{
+  clib_warning ("BUG: STUB called");
+  return 1;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *