X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_debug.h;h=2912ae3828c27e71416c639775223498e2b06861;hb=cb36a1dbaf29babb536bd10d0ff3ff35ca57bfa3;hp=f63509d1ffb8d35e7dffa09eba69721f7fe56825;hpb=c1a448b3ad16f4ae78527220420fe5c1e41a4ab9;p=vpp.git

diff --git a/src/vnet/session/session_debug.h b/src/vnet/session/session_debug.h
index f63509d1ffb..2912ae3828c 100644
--- a/src/vnet/session/session_debug.h
+++ b/src/vnet/session/session_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -23,6 +23,8 @@
   _(DEQ, "dequeue")			\
   _(DEQ_NODE, "dequeue")		\
   _(POLL_GAP_TRACK, "poll gap track")	\
+  _(POLL_DISPATCH_TIME, "dispatch time")\
+  _(DISPATCH_END, "dispatch end")	\
 
 typedef enum _session_evt_dbg
 {
@@ -31,7 +33,7 @@ typedef enum _session_evt_dbg
 #undef _
 } session_evt_dbg_e;
 
-#define SESSION_DEBUG (0 && TRANSPORT_DEBUG)
+#define SESSION_DEBUG 0 * (TRANSPORT_DEBUG > 0)
 #define SESSION_DEQ_NODE_EVTS (0)
 #define SESSION_EVT_POLL_DBG (0)
 
@@ -55,6 +57,7 @@ typedef enum _session_evt_dbg
   } * ed;								\
   ed = ELOG_DATA (&vlib_global_main.elog_main, _e)
 
+#if SESSION_DEQ_NODE_EVTS && SESSION_DEBUG > 1
 #define SESSION_EVT_DEQ_HANDLER(_s, _body)				\
 {									\
   ELOG_TYPE_DECLARE (_e) =						\
@@ -77,7 +80,6 @@ typedef enum _session_evt_dbg
   do { _body; } while (0);						\
 }
 
-#if SESSION_DEQ_NODE_EVTS && SESSION_DEBUG > 1
 #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)				\
 {									\
   ELOG_TYPE_DECLARE (_e) =						\
@@ -94,6 +96,8 @@ typedef enum _session_evt_dbg
   ed->data[0] = _node_evt;						\
 }
 #else
+#define SESSION_EVT_DEQ_HANDLER(_s, _body)
+#define SESSION_EVT_ENQ_HANDLER(_s, _body)
 #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)
 #endif /* SESSION_DEQ_NODE_EVTS */
 
@@ -117,11 +121,34 @@ typedef enum _session_evt_dbg
   _smm->last_event_poll_by_thread[_ti] = now;				\
 }
 
+#define SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_smm, _ti)		\
+{									\
+  f64 diff = vlib_time_now (vlib_get_main ()) -				\
+	       _smm->last_event_poll_by_thread[_ti];			\
+  if (diff > 5e-2)							\
+    {									\
+      ELOG_TYPE_DECLARE (_e) =						\
+      {									\
+        .format = "dispatch time: %d us",				\
+        .format_args = "i4",						\
+      };								\
+      DEC_SESSION_ED(_e, 1);						\
+      ed->data[0] = diff *1000000.0;					\
+    }									\
+}
+
 #else
 #define SESSION_EVT_POLL_GAP(_smm, _my_thread_index)
 #define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _my_thread_index)
+#define SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_smm, _ti)
 #endif /* SESSION_EVT_POLL_DBG */
 
+#define SESSION_EVT_DISPATCH_END_HANDLER(_smm, _ti)			\
+{									\
+  SESSION_EVT_DEQ_NODE_HANDLER(1);					\
+  SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_smm, _ti);			\
+}
+
 #define CONCAT_HELPER(_a, _b) _a##_b
 #define CC(_a, _b) CONCAT_HELPER(_a, _b)
 #define SESSION_EVT_DBG(_evt, _args...) CC(_evt, _HANDLER)(_args)