X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Ftrace_funcs.h;h=4261f675aecc708a5645e2fb70c8f778ca84171f;hb=4ed2598562b1fe65efe69ae53397dfe9f1f07be8;hp=d0eeb29837badf88a2e4d451e45a4e7becc4d906;hpb=99536f4b492478bab66ee8c6b0905a940b8db3c9;p=vpp.git

diff --git a/src/vlib/trace_funcs.h b/src/vlib/trace_funcs.h
index d0eeb29837b..4261f675aec 100644
--- a/src/vlib/trace_funcs.h
+++ b/src/vlib/trace_funcs.h
@@ -61,6 +61,9 @@ vlib_add_trace (vlib_main_t * vm,
 
   ASSERT (vnet_trace_dummy);
 
+  if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_IS_TRACED) == 0))
+    return vnet_trace_dummy;
+
   if (PREDICT_FALSE (tm->add_trace_callback != 0))
     {
       return tm->add_trace_callback ((struct vlib_main_t *) vm,
@@ -118,6 +121,9 @@ vlib_trace_next_frame (vlib_main_t * vm,
 }
 
 void trace_apply_filter (vlib_main_t * vm);
+int vnet_is_packet_traced (vlib_buffer_t * b,
+			   u32 classify_table_index, int func);
+
 
 /* Mark buffer as traced and allocate trace buffer. */
 always_inline void
@@ -131,6 +137,16 @@ vlib_trace_buffer (vlib_main_t * vm,
   if (PREDICT_FALSE (tm->trace_enable == 0))
     return;
 
+  /* Classifier filter in use? */
+  if (PREDICT_FALSE (vlib_global_main.trace_filter.trace_filter_enable))
+    {
+      /* See if we're supposed to trace this packet... */
+      if (vnet_is_packet_traced
+	  (b, vlib_global_main.trace_filter.trace_classify_table_index,
+	   0 /* full classify */ ) != 1)
+	return;
+    }
+
   /*
    * Apply filter to existing traces to keep number of allocated traces low.
    * Performed each time around the main loop.
@@ -145,7 +161,7 @@ vlib_trace_buffer (vlib_main_t * vm,
 				     (struct vlib_trace_main_t *) tm);
     }
 
-  //vlib_trace_next_frame (vm, r, next_index);
+  vlib_trace_next_frame (vm, r, next_index);
 
   pool_get (tm->trace_buffer_pool, h);