tcp/session: debug improvements/fixes

[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 eb11f1a..f63509d 100644 (file)
--- a/src/vnet/session/session_debug.h
+++ b/src/vnet/session/session_debug.h
@@ -31,21 +31,20 @@ 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 (1)
+#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                                                               \
   {                                                                    \
     u32 data[_size];                                                   \
   } * ed;                                                              \
-  transport_proto_vft_t *vft =                                                 \
-      session_get_transport_vft (_s->session_type);                    \
-  transport_connection_t *_tc =                                        \
-      vft->get_connection (_s->connection_index, _s->thread_index);    \
+  transport_connection_t *_tc = session_get_transport (_s);            \
   ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main,                   \
                        _e, _tc->elog_track)
 
@@ -78,7 +77,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) =                                             \
@@ -96,33 +95,32 @@ typedef enum _session_evt_dbg
 }
 #else
 #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)
-#endif
+#endif /* SESSION_DEQ_NODE_EVTS */
 
-#if SESSION_DBG && SESSION_EVT_POLL_DBG
-#define SESSION_EVT_POLL_GAP(_smm, _my_thread_index)                   \
+#if SESSION_EVT_POLL_DBG && SESSION_DEBUG > 1
+#define SESSION_EVT_POLL_GAP(_smm, _ti)                                        \
 {                                                                      \
   ELOG_TYPE_DECLARE (_e) =                                             \
   {                                                                    \
-    .format = "nixon-gap: %d MS",                                      \
+    .format = "nixon-gap: %d us",                                      \
     .format_args = "i4",                                               \
   };                                                                   \
   DEC_SESSION_ED(_e, 1);                                               \
   ed->data[0] =        (u32) ((now -                                           \
-    _smm->last_event_poll_by_thread[my_thread_index])*1000.0);         \
+      _smm->last_event_poll_by_thread[_ti])*1000000.0);                        \
 }
-#define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _my_thread_index)     \
+#define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _ti)                  \
 {                                                                      \
-  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;              \
+  if (PREDICT_TRUE (smm->last_event_poll_by_thread[_ti] != 0.0))       \
+    if (now > smm->last_event_poll_by_thread[_ti] + 500e-6)            \
+      SESSION_EVT_POLL_GAP(smm, _ti);                                  \
+  _smm->last_event_poll_by_thread[_ti] = now;                          \
 }
 
 #else
 #define SESSION_EVT_POLL_GAP(_smm, _my_thread_index)
 #define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _my_thread_index)
-#endif
+#endif /* SESSION_EVT_POLL_DBG */
 
 #define CONCAT_HELPER(_a, _b) _a##_b
 #define CC(_a, _b) CONCAT_HELPER(_a, _b)
@@ -130,7 +128,8 @@ typedef enum _session_evt_dbg
 
 #else
 #define SESSION_EVT_DBG(_evt, _args...)
-#endif
+#define SESSION_DBG(_fmt, _args...)
+#endif /* SESSION_DEBUG */
 
 #endif /* SRC_VNET_SESSION_SESSION_DEBUG_H_ */
 /*