X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_debug.h;h=12c667c08d873e3efa3387bc5e39501976be44a1;hb=371ca50a74a9c4f1b74c4c1b65c6fdec610fcfc3;hp=80a97cd5f09e6206feadc7b7c334ee11174eb0cf;hpb=6792ec059696a358b6c98d8d86e9740b34c01e24;p=vpp.git

diff --git a/src/vnet/session/session_debug.h b/src/vnet/session/session_debug.h
index 80a97cd5f09..12c667c08d8 100644
--- a/src/vnet/session/session_debug.h
+++ b/src/vnet/session/session_debug.h
@@ -16,13 +16,13 @@
 #define SRC_VNET_SESSION_SESSION_DEBUG_H_
 
 #include <vnet/session/transport.h>
-#include <vnet/session/session.h>
 #include <vlib/vlib.h>
 
 #define foreach_session_dbg_evt		\
   _(ENQ, "enqueue")			\
   _(DEQ, "dequeue")			\
-  _(DEQ_NODE, "dequeue")
+  _(DEQ_NODE, "dequeue")		\
+  _(POLL_GAP_TRACK, "poll gap track")	\
 
 typedef enum _session_evt_dbg
 {
@@ -31,10 +31,13 @@ typedef enum _session_evt_dbg
 #undef _
 } session_evt_dbg_e;
 
-#define SESSION_DBG (0)
+#define SESSION_DEBUG (0 && TRANSPORT_DEBUG)
 #define SESSION_DEQ_NODE_EVTS (0)
+#define SESSION_EVT_POLL_DBG (0)
 
-#if TRANSPORT_DEBUG && SESSION_DBG
+#if SESSION_DEBUG
+
+#define SESSION_DBG(_fmt, _args...) clib_warning (_fmt, ##_args)
 
 #define DEC_SESSION_ETD(_s, _e, _size)					\
   struct								\
@@ -42,7 +45,7 @@ typedef enum _session_evt_dbg
     u32 data[_size];							\
   } * ed;								\
   transport_proto_vft_t *vft = 						\
-      session_get_transport_vft (_s->session_type);			\
+      transport_protocol_get_vft (_s->session_type);			\
   transport_connection_t *_tc = 					\
       vft->get_connection (_s->connection_index, _s->thread_index);	\
   ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main,			\
@@ -77,7 +80,7 @@ typedef enum _session_evt_dbg
   do { _body; } while (0);						\
 }
 
-#if SESSION_DEQ_NODE_EVTS
+#if SESSION_DEQ_NODE_EVTS && SESSION_DEBUG > 1
 #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)				\
 {									\
   ELOG_TYPE_DECLARE (_e) =						\
@@ -95,16 +98,42 @@ typedef enum _session_evt_dbg
 }
 #else
 #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)
-#endif
+#endif /* SESSION_DEQ_NODE_EVTS */
+
+#if SESSION_EVT_POLL_DBG && SESSION_DEBUG > 1
+#define SESSION_EVT_POLL_GAP(_smm, _my_thread_index)			\
+{									\
+  ELOG_TYPE_DECLARE (_e) =						\
+  {									\
+    .format = "nixon-gap: %d MS",					\
+    .format_args = "i4",						\
+  };									\
+  DEC_SESSION_ED(_e, 1);						\
+  ed->data[0] =	(u32) ((now -						\
+    _smm->last_event_poll_by_thread[my_thread_index])*1000.0);		\
+}
+#define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _my_thread_index)	\
+{									\
+  if (PREDICT_TRUE(							\
+	      smm->last_event_poll_by_thread[my_thread_index] != 0.0))	\
+    if (now > smm->last_event_poll_by_thread[_my_thread_index] + 500e-6)\
+	SESSION_EVT_POLL_GAP(smm, my_thread_index);			\
+  _smm->last_event_poll_by_thread[my_thread_index] = now;		\
+}
+
+#else
+#define SESSION_EVT_POLL_GAP(_smm, _my_thread_index)
+#define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _my_thread_index)
+#endif /* SESSION_EVT_POLL_DBG */
 
 #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)
 
 #else
 #define SESSION_EVT_DBG(_evt, _args...)
-#endif
+#define SESSION_DBG(_fmt, _args...)
+#endif /* SESSION_DEBUG */
 
 #endif /* SRC_VNET_SESSION_SESSION_DEBUG_H_ */
 /*