ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session: fix dispatch event logging

Browse Source 
Type: fix

Change-Id: Icf3c73cd7eb7565ed6e1b0371da172b5408a9d36
Signed-off-by: Florin Coras <fcoras@cisco.com>
(cherry picked from commit ba13c3b369)
This commit is contained in:
Florin Coras
2019-10-30 17:11:53 -07:00
committed by Andrew Yourtchenko
parent 6de46b40d2
commit e04a58d27b
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/vnet/session/session_debug.h
View File

@@ -37,6 +37,7 @@ typedef enum _session_evt_dbg
#define SESSION_DEBUG 0 * (TRANSPORT_DEBUG > 0) #define SESSION_DEBUG 0 * (TRANSPORT_DEBUG > 0)
#define SESSION_DEQ_EVTS (0) #define SESSION_DEQ_EVTS (0)
#define SESSION_DISPATCH_DBG (0)
#define SESSION_EVT_POLL_DBG (0) #define SESSION_EVT_POLL_DBG (0)
#define SESSION_SM (0) #define SESSION_SM (0)
@@ -100,27 +101,35 @@ typedef enum _session_evt_dbg
DEC_SESSION_ETD(_s, _e, 1); \ DEC_SESSION_ETD(_s, _e, 1); \
ed->data[0] = _len; \ ed->data[0] = _len; \
} }
#else
#define SESSION_EVT_DEQ_HANDLER(_s, _now, _max, _has_evt, _ts)
#define SESSION_EVT_ENQ_HANDLER(_s, _body)
#endif /* SESSION_DEQ_NODE_EVTS */
#define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt) \ #if SESSION_DISPATCH_DBG
#define SESSION_EVT_DEQ_NODE_HANDLER(_wrk, _node_evt, _ntx) \
{ \ { \
ELOG_TYPE_DECLARE (_e) = \ ELOG_TYPE_DECLARE (_e) = \
{ \ { \
.format = "deq-node: %s", \ .format = "dispatch: %s pkts %u re-entry: %u dispatch %u", \
.format_args = "t4", \ .format_args = "t4i4i4i4", \
.n_enum_strings = 2, \ .n_enum_strings = 2, \
.enum_strings = { \ .enum_strings = { \
"start", \ "start", \
"end", \ "end", \
}, \ }, \
}; \ }; \
DEC_SESSION_ED(_e, 1); \ DEC_SESSION_ED(_e, 4); \
ed->data[0] = _node_evt; \ ed->data[0] = _node_evt; \
ed->data[1] = _ntx; \
ed->data[2] = (_wrk->last_vlib_time - _wrk->last_event_poll) \
* 1000000.0; \
ed->data[3] = (vlib_time_now (_wrk->vm) - _wrk->last_vlib_time) \
* 1000000.0; \
} }
#else #else
#define SESSION_EVT_DEQ_HANDLER(_s, _body) #define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt, _ntx)
#define SESSION_EVT_ENQ_HANDLER(_s, _body) #endif /* SESSION_DISPATCH_DBG */
#define SESSION_EVT_DEQ_NODE_HANDLER(_node_evt)
#endif /* SESSION_DEQ_NODE_EVTS */
#if SESSION_EVT_POLL_DBG && SESSION_DEBUG > 1 #if SESSION_EVT_POLL_DBG && SESSION_DEBUG > 1
#define SESSION_EVT_POLL_GAP(_wrk) \ #define SESSION_EVT_POLL_GAP(_wrk) \
@@ -131,14 +140,15 @@ typedef enum _session_evt_dbg
.format_args = "i4", \ .format_args = "i4", \
}; \ }; \
DEC_SESSION_ED(_e, 1); \ DEC_SESSION_ED(_e, 1); \
ed->data[0] = (u32) ((now - _wrk->last_event_poll)*1000000.0); \ ed->data[0] = (u32) ((_wrk->last_vlib_time - _wrk->last_event_poll) \
*1000000.0); \
} }
#define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_wrk) \ #define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_wrk) \
{ \ { \
if (PREDICT_TRUE (smm->last_event_poll != 0.0)) \ if (PREDICT_TRUE (_wrk->last_event_poll != 0.0)) \
if (now > smm->last_event_poll + 500e-6) \ if (_wrk->last_vlib_time > _wrk->last_event_poll + 500e-6) \
SESSION_EVT_POLL_GAP(smm, _ti); \ SESSION_EVT_POLL_GAP(_wrk); \
_wrk->last_event_poll = now; \ _wrk->last_event_poll = _wrk->last_vlib_time; \
} }
#define SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_wrk) \ #define SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_wrk) \
@@ -165,15 +175,16 @@ typedef enum _session_evt_dbg
#define SESSION_EVT_DISPATCH_START_HANDLER(_wrk) \ #define SESSION_EVT_DISPATCH_START_HANDLER(_wrk) \
{ \ { \
if (SESSION_DEQ_EVTS > 1) \ if (SESSION_DEQ_EVTS > 1) \
SESSION_EVT_DEQ_NODE_HANDLER (0); \ SESSION_EVT_DEQ_NODE_HANDLER (_wrk, 0, 0); \
SESSION_EVT_POLL_GAP_TRACK_HANDLER (wrk); \ SESSION_EVT_POLL_GAP_TRACK_HANDLER (wrk); \
} }
#define SESSION_EVT_DISPATCH_END_HANDLER(_wrk, _ntx) \ #define SESSION_EVT_DISPATCH_END_HANDLER(_wrk, _ntx) \
{ \ { \
if (SESSION_DEQ_EVTS > 1 || _ntx) \ if (_ntx) \
SESSION_EVT_DEQ_NODE_HANDLER (1); \ SESSION_EVT_DEQ_NODE_HANDLER (_wrk, 1, _ntx); \
SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_wrk); \ SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_wrk); \
_wrk->last_event_poll = vlib_time_now (_wrk->vm); \
} }
#define CONCAT_HELPER(_a, _b) _a##_b #define CONCAT_HELPER(_a, _b) _a##_b