commit c1a448b3ad16f4ae78527220420fe5c1e41a4ab9
author Florin Coras <fcoras@cisco.com> Fri Apr 20 10:51:49 2018 -0700
committer Florin Coras <fcoras@cisco.com> Mon Apr 30 23:50:41 2018 -0700
tree bcccc20a32a8dfdd27c8eb32e20681ec30785c86
parent f4addbd03a21c6aa2a25d693cfd66988605fff36

tcp/session: debug improvements/fixes

Change-Id: I906e58b4f9827a79a6ab673f8fa2e03036c69820
Signed-off-by: Florin Coras <fcoras@cisco.com>

src/vnet/session/session_debug.h

diff --git a/src/vnet/session/session_debug.h b/src/vnet/session/session_debug.h
index 12c667c..f63509d 100644
--- a/src/vnet/session/session_debug.h
+++ b/src/vnet/session/session_debug.h
@@ -44,10 +44,7 @@
   {									\
     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)
 
@@ -101,24 +98,23 @@
 #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, _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