-#define SESSION_EVT_POLL_GAP(_smm, _my_thread_index)
-#define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_smm, _my_thread_index)
-#endif
+#define SESSION_EVT_POLL_GAP(_wrk)
+#define SESSION_EVT_POLL_GAP_TRACK_HANDLER(_wrk)
+#define SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_wrk)
+#endif /* SESSION_EVT_POLL_DBG */
+
+#define SESSION_EVT_DISPATCH_START_HANDLER(_wrk) \
+{ \
+ if (SESSION_DEQ_EVTS > 1) \
+ SESSION_EVT_DEQ_NODE_HANDLER (_wrk, 0, 0); \
+ SESSION_EVT_POLL_GAP_TRACK_HANDLER (wrk); \
+}
+
+#define SESSION_EVT_DISPATCH_END_HANDLER(_wrk, _ntx) \
+{ \
+ if (_ntx) \
+ SESSION_EVT_DEQ_NODE_HANDLER (_wrk, 1, _ntx); \
+ SESSION_EVT_POLL_DISPATCH_TIME_HANDLER(_wrk); \
+ _wrk->last_event_poll = vlib_time_now (_wrk->vm); \
+}