mpipe: clean up decode thread local storage

Clean up the thread local data the decode portion of mpipe uses.

Bug #978
pull/914/merge
Victor Julien 11 years ago
parent 8c16fede08
commit 09ebbe08df

@ -128,6 +128,7 @@ TmEcode ReceiveMpipeThreadInit(ThreadVars *, void *, void **);
void ReceiveMpipeThreadExitStats(ThreadVars *, void *); void ReceiveMpipeThreadExitStats(ThreadVars *, void *);
TmEcode DecodeMpipeThreadInit(ThreadVars *, void *, void **); TmEcode DecodeMpipeThreadInit(ThreadVars *, void *, void **);
TmEcode DecodeMpipeThreadDeinit(ThreadVars *tv, void *data);
TmEcode DecodeMpipe(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *); TmEcode DecodeMpipe(ThreadVars *, Packet *, void *, PacketQueue *, PacketQueue *);
static int MpipeReceiveOpenIqueue(int rank); static int MpipeReceiveOpenIqueue(int rank);
@ -191,7 +192,7 @@ void TmModuleDecodeMpipeRegister (void)
tmm_modules[TMM_DECODEMPIPE].ThreadInit = DecodeMpipeThreadInit; tmm_modules[TMM_DECODEMPIPE].ThreadInit = DecodeMpipeThreadInit;
tmm_modules[TMM_DECODEMPIPE].Func = DecodeMpipe; tmm_modules[TMM_DECODEMPIPE].Func = DecodeMpipe;
tmm_modules[TMM_DECODEMPIPE].ThreadExitPrintStats = NULL; tmm_modules[TMM_DECODEMPIPE].ThreadExitPrintStats = NULL;
tmm_modules[TMM_DECODEMPIPE].ThreadDeinit = NULL; tmm_modules[TMM_DECODEMPIPE].ThreadDeinit = DecodeMpipeThreadDeinit;
tmm_modules[TMM_DECODEMPIPE].RegisterTests = NULL; tmm_modules[TMM_DECODEMPIPE].RegisterTests = NULL;
tmm_modules[TMM_DECODEMPIPE].cap_flags = 0; tmm_modules[TMM_DECODEMPIPE].cap_flags = 0;
tmm_modules[TMM_DECODEMPIPE].flags = TM_FLAG_DECODE_TM; tmm_modules[TMM_DECODEMPIPE].flags = TM_FLAG_DECODE_TM;
@ -1024,6 +1025,13 @@ TmEcode DecodeMpipeThreadInit(ThreadVars *tv, void *initdata, void **data)
SCReturnInt(TM_ECODE_OK); SCReturnInt(TM_ECODE_OK);
} }
TmEcode DecodeMpipeThreadDeinit(ThreadVars *tv, void *data)
{
if (data != NULL)
DecodeThreadVarsFree(data);
SCReturnInt(TM_ECODE_OK);
}
TmEcode DecodeMpipe(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq, TmEcode DecodeMpipe(ThreadVars *tv, Packet *p, void *data, PacketQueue *pq,
PacketQueue *postq) PacketQueue *postq)
{ {

Loading…
Cancel
Save