TCP/session improvements

[vpp.git] / src / vnet / session / session_debug.h

diff --git a/src/vnet/session/session_debug.h b/src/vnet/session/session_debug.h
index 858f12e..80a97cd 100644 (file)
--- a/src/vnet/session/session_debug.h
+++ b/src/vnet/session/session_debug.h
@@ -21,7 +21,8 @@
 
 #define foreach_session_dbg_evt                \
   _(ENQ, "enqueue")                    \
-  _(DEQ, "dequeue")
+  _(DEQ, "dequeue")                    \
+  _(DEQ_NODE, "dequeue")
 
 typedef enum _session_evt_dbg
 {
@@ -30,7 +31,10 @@ typedef enum _session_evt_dbg
 #undef _
 } session_evt_dbg_e;
 
-#if TRANSPORT_DEBUG
+#define SESSION_DBG (0)
+#define SESSION_DEQ_NODE_EVTS (0)
+
+#if TRANSPORT_DEBUG && SESSION_DBG
 
 #define DEC_SESSION_ETD(_s, _e, _size)                                 \
   struct                                                               \
@@ -44,6 +48,12 @@ typedef enum _session_evt_dbg
   ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main,                   \
                        _e, _tc->elog_track)
 
+#define DEC_SESSION_ED(_e, _size)                                      \
+  struct                                                               \
+  {                                                                    \
+    u32 data[_size];                                                   \
+  } * ed;                                                              \
+  ed = ELOG_DATA (&vlib_global_main.elog_main, _e)
 
 #define SESSION_EVT_DEQ_HANDLER(_s, _body)                             \
 {                                                                      \
@@ -67,13 +77,33 @@ typedef enum _session_evt_dbg
   do { _body; } while (0);                                             \
 }
 
+#if SESSION_DEQ_NODE_EVTS
+#define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)                                \
+{                                                                      \
+  ELOG_TYPE_DECLARE (_e) =                                             \
+  {                                                                    \
+    .format = "deq-node: %s",                                          \
+    .format_args = "t4",                                               \
+    .n_enum_strings = 2,                                               \
+    .enum_strings = {                                                  \
+      "start",                                                         \
+      "end",                                                           \
+    },                                                                 \
+  };                                                                   \
+  DEC_SESSION_ED(_e, 1);                                               \
+  ed->data[0] = _node_evt;                                             \
+}
+#else
+#define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)
+#endif
+
 #define CONCAT_HELPER(_a, _b) _a##_b
 #define CC(_a, _b) CONCAT_HELPER(_a, _b)
 
-#define SESSION_EVT_DBG(_s, _evt, _body) CC(_evt, _HANDLER)(_s, _body)
+#define SESSION_EVT_DBG(_evt, _args...) CC(_evt, _HANDLER)(_args)
 
 #else
-#define SESSION_EVT_DBG(_s, _evt, _body)
+#define SESSION_EVT_DBG(_evt, _args...)
 #endif
 
 #endif /* SRC_VNET_SESSION_SESSION_DEBUG_H_ */