|
|
|
@ -161,7 +161,7 @@ void *TmThreadsSlot1NoIn(void *td)
|
|
|
|
|
TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
|
|
|
|
|
pthread_exit((void *) -1);
|
|
|
|
|
}
|
|
|
|
|
SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
(void)SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
}
|
|
|
|
|
memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
|
|
|
|
|
memset(&s->slot_post_pq, 0, sizeof(PacketQueue));
|
|
|
|
@ -260,7 +260,7 @@ void *TmThreadsSlot1NoOut(void *td)
|
|
|
|
|
TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
|
|
|
|
|
pthread_exit((void *) -1);
|
|
|
|
|
}
|
|
|
|
|
SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
(void)SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
}
|
|
|
|
|
memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
|
|
|
|
|
memset(&s->slot_post_pq, 0, sizeof(PacketQueue));
|
|
|
|
@ -342,7 +342,7 @@ void *TmThreadsSlot1NoInOut(void *td)
|
|
|
|
|
TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
|
|
|
|
|
pthread_exit((void *) -1);
|
|
|
|
|
}
|
|
|
|
|
SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
(void)SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
}
|
|
|
|
|
memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
|
|
|
|
|
memset(&s->slot_post_pq, 0, sizeof(PacketQueue));
|
|
|
|
@ -419,7 +419,7 @@ void *TmThreadsSlot1(void *td)
|
|
|
|
|
TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
|
|
|
|
|
pthread_exit((void *) -1);
|
|
|
|
|
}
|
|
|
|
|
SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
(void)SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
}
|
|
|
|
|
memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
|
|
|
|
|
SCMutexInit(&s->slot_pre_pq.mutex_q, NULL);
|
|
|
|
@ -637,7 +637,7 @@ void *TmThreadsSlotPktAcqLoop(void *td) {
|
|
|
|
|
TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
|
|
|
|
|
pthread_exit((void *) -1);
|
|
|
|
|
}
|
|
|
|
|
SC_ATOMIC_SET(slot->slot_data, slot_data);
|
|
|
|
|
(void)SC_ATOMIC_SET(slot->slot_data, slot_data);
|
|
|
|
|
}
|
|
|
|
|
memset(&slot->slot_pre_pq, 0, sizeof(PacketQueue));
|
|
|
|
|
SCMutexInit(&slot->slot_pre_pq.mutex_q, NULL);
|
|
|
|
@ -726,7 +726,7 @@ void *TmThreadsSlotVar(void *td)
|
|
|
|
|
TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
|
|
|
|
|
pthread_exit((void *) -1);
|
|
|
|
|
}
|
|
|
|
|
SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
(void)SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
}
|
|
|
|
|
memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
|
|
|
|
|
SCMutexInit(&s->slot_pre_pq.mutex_q, NULL);
|
|
|
|
@ -915,7 +915,7 @@ static inline TmSlot * _TmSlotSetFuncAppend(ThreadVars *tv, TmModule *tm, void *
|
|
|
|
|
slot->SlotThreadInit = tm->ThreadInit;
|
|
|
|
|
slot->slot_initdata = data;
|
|
|
|
|
SC_ATOMIC_INIT(slot->SlotFunc);
|
|
|
|
|
SC_ATOMIC_SET(slot->SlotFunc, tm->Func);
|
|
|
|
|
(void)SC_ATOMIC_SET(slot->SlotFunc, tm->Func);
|
|
|
|
|
slot->PktAcqLoop = tm->PktAcqLoop;
|
|
|
|
|
slot->SlotThreadExitPrintStats = tm->ThreadExitPrintStats;
|
|
|
|
|
slot->SlotThreadDeinit = tm->ThreadDeinit;
|
|
|
|
@ -994,7 +994,7 @@ void TmSlotSetFuncAppendDelayed(ThreadVars *tv, TmModule *tm, void *data,
|
|
|
|
|
memset(dslot, 0, sizeof(*dslot));
|
|
|
|
|
|
|
|
|
|
dslot->SlotFunc = SC_ATOMIC_GET(slot->SlotFunc);
|
|
|
|
|
SC_ATOMIC_SET(slot->SlotFunc, TmDummyFunc);
|
|
|
|
|
(void)SC_ATOMIC_SET(slot->SlotFunc, TmDummyFunc);
|
|
|
|
|
dslot->SlotThreadInit = slot->SlotThreadInit;
|
|
|
|
|
slot->SlotThreadInit = NULL;
|
|
|
|
|
dslot->slot = slot;
|
|
|
|
@ -1023,7 +1023,7 @@ void TmThreadActivateDummySlot()
|
|
|
|
|
EngineKill();
|
|
|
|
|
TmThreadsSetFlag(s->tv, THV_CLOSED | THV_RUNNING_DONE);
|
|
|
|
|
}
|
|
|
|
|
SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
(void)SC_ATOMIC_SET(s->slot_data, slot_data);
|
|
|
|
|
}
|
|
|
|
|
(void)SC_ATOMIC_CAS(&s->SlotFunc, TmDummyFunc, dslot->SlotFunc);
|
|
|
|
|
}
|
|
|
|
|