From baddfcaa1ab4d38ffbd63065c5fa35abf0abd8d7 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Fri, 9 Sep 2011 10:30:40 +0200 Subject: [PATCH] Extend packet profiling to other thread 'slot' functions. --- src/tm-threads.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/tm-threads.c b/src/tm-threads.c index 8653bbf885..8d227e7e35 100644 --- a/src/tm-threads.c +++ b/src/tm-threads.c @@ -135,7 +135,10 @@ void *TmThreadsSlot1NoIn(void *td) while (run) { TmThreadTestThreadUnPaused(tv); + PACKET_PROFILING_TMM_START(p, s->tm_module_id); r = s->SlotFunc(tv, p, s->slot_data, &s->slot_pre_pq, &s->slot_post_pq); + PACKET_PROFILING_TMM_END(p, s->tm_module_id); + /* handle error */ if (r == TM_ECODE_FAILED) { TmqhReleasePacketsToPacketPool(&s->slot_pre_pq); @@ -222,8 +225,11 @@ void *TmThreadsSlot1NoOut(void *td) p = tv->tmqh_in(tv); + PACKET_PROFILING_TMM_START(p, s->tm_module_id); r = s->SlotFunc(tv, p, s->slot_data, /* no outqh no pq */ NULL, /* no outqh no pq */ NULL); + PACKET_PROFILING_TMM_END(p, s->tm_module_id); + /* handle error */ if (r == TM_ECODE_FAILED) { TmqhOutputPacketpool(tv, p); @@ -356,10 +362,12 @@ void *TmThreadsSlot1(void *td) /* input a packet */ p = tv->tmqh_in(tv); - if (p == NULL) { - } else { + if (p != NULL) { + PACKET_PROFILING_TMM_START(p, s->tm_module_id); r = s->SlotFunc(tv, p, s->slot_data, &s->slot_pre_pq, &s->slot_post_pq); + PACKET_PROFILING_TMM_END(p, s->tm_module_id); + /* handle error */ if (r == TM_ECODE_FAILED) { TmqhReleasePacketsToPacketPool(&s->slot_pre_pq);