tcp: optimize tcp output

[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 80a97cd..559f0bd 100644 (file)
--- a/src/vnet/session/session_debug.h
+++ b/src/vnet/session/session_debug.h
@@ -16,13 +16,15 @@
 #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")  \
+  _(POLL_DISPATCH_TIME, "dispatch time")\
+  _(DISPATCH_END, "dispatch end")      \
 
 typedef enum _session_evt_dbg
 {
@@ -31,20 +33,20 @@ typedef enum _session_evt_dbg
 #undef _
 } session_evt_dbg_e;
 
-#define SESSION_DBG (0)
+#define SESSION_DEBUG 0 * (TRANSPORT_DEBUG > 0)
 #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                                                               \
   {                                                                    \
     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)
 
@@ -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
 #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)                                \
 {                                                                      \
   ELOG_TYPE_DECLARE (_e) =                                             \
@@ -94,17 +96,67 @@ 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
+#endif /* SESSION_DEQ_NODE_EVTS */
+
+#if SESSION_EVT_POLL_DBG && SESSION_DEBUG > 1
+#define SESSION_EVT_POLL_GAP(_smm, _ti)                                        \
+{                                                                      \
+  ELOG_TYPE_DECLARE (_e) =                                             \
+  {                                                                    \
+    .format = "nixon-gap: %d us",                                      \
+    .format_args = "i4",                                               \
+  };                                                                   \
+  DEC_SESSION_ED(_e, 1);                                               \
+  ed->data[0] =        (u32) ((now -                                           \
+      _smm->last_event_poll_by_thread[_ti])*1000000.0);                        \
+}
+#define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _ti)                  \
+{                                                                      \
+  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;                          \
+}
+
+#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)
 
 #else
 #define SESSION_EVT_DBG(_evt, _args...)
-#endif
+#define SESSION_DBG(_fmt, _args...)
+#endif /* SESSION_DEBUG */
 
 #endif /* SRC_VNET_SESSION_SESSION_DEBUG_H_ */
 /*