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 702fe96..559f0bd 100644 (file)
--- a/src/vnet/session/session_debug.h
+++ b/src/vnet/session/session_debug.h
@@ -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,9 +33,9 @@ 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 (1)
+#define SESSION_EVT_POLL_DBG (0)
 
 #if SESSION_DEBUG
 
@@ -44,10 +46,7 @@ typedef enum _session_evt_dbg
   {                                                                    \
     u32 data[_size];                                                   \
   } * ed;                                                              \
-  transport_proto_vft_t *vft =                                                 \
-      transport_protocol_get_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)
 
@@ -58,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) =                                             \
@@ -80,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) =                                             \
@@ -97,35 +96,59 @@ 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 */
 
 #if SESSION_EVT_POLL_DBG && SESSION_DEBUG > 1
-#define SESSION_EVT_POLL_GAP(_smm, _my_thread_index)                   \
+#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, _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_GAP_TRACK_HANDLER(_smm, _my_thread_index)     \
+
+#define SESSION_EVT_POLL_DISPATCH_TIME_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;              \
+  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)