stats api: call thread deinit API functions

Thread deinit funcs weren't called. This meant the lua scripts 'deinit'
functions weren't called either.
pull/1329/head
Victor Julien 11 years ago
parent 10104066e1
commit bc2c7f462e

@ -320,6 +320,12 @@ static void *SCPerfMgmtThread(void *arg)
TmThreadsSetFlag(tv_local, THV_RUNNING_DONE);
TmThreadWaitForFlag(tv_local, THV_DEINIT);
r = tm->ThreadDeinit(tv_local, stats_thread_data);
if (r != TM_ECODE_OK) {
SCLogError(SC_ERR_THREAD_DEINIT, "Perf Counter API "
"ThreadDeinit failed");
}
TmThreadsSetFlag(tv_local, THV_CLOSED);
return NULL;
}

@ -114,6 +114,7 @@ const char * SCErrorToString(SCError err)
CASE_CODE (SC_ERR_THREAD_SPAWN);
CASE_CODE (SC_ERR_THREAD_CREATE);
CASE_CODE (SC_ERR_THREAD_INIT);
CASE_CODE (SC_ERR_THREAD_DEINIT);
CASE_CODE (SC_ERR_THRESHOLD_HASH_ADD);
CASE_CODE (SC_ERR_UNDEFINED_VAR);
CASE_CODE (SC_ERR_RULE_KEYWORD_UNKNOWN);

@ -294,6 +294,7 @@ typedef enum {
SC_ERR_NO_NETMAP,
SC_ERR_NETMAP_CREATE,
SC_ERR_NETMAP_READ,
SC_ERR_THREAD_DEINIT, /**< thread's deinit function failed */
} SCError;
const char *SCErrorToString(SCError);

Loading…
Cancel
Save