Minor changes to move function calls that kills threads + frees resources to the clean up phase right to the end of main thread

remotes/origin/master-1.1.x
Anoop Saldanha 15 years ago committed by Victor Julien
parent ff7284e7b7
commit 975ebf2e4f

@ -1485,12 +1485,6 @@ int main(int argc, char **argv)
SCLogInfo("time elapsed %" PRIuMAX "s", (uintmax_t)(end_time.tv_sec - start_time.tv_sec)); SCLogInfo("time elapsed %" PRIuMAX "s", (uintmax_t)(end_time.tv_sec - start_time.tv_sec));
#ifdef __SC_CUDA_SUPPORT__
SCCudaPBKillBatchingPackets();
#endif
TmThreadKillThreads();
SCPerfReleaseResources();
break; break;
} }
@ -1503,6 +1497,12 @@ int main(int argc, char **argv)
SC_ATOMIC_CAS(&engine_stage, SURICATA_RUNTIME, SURICATA_DEINIT); SC_ATOMIC_CAS(&engine_stage, SURICATA_RUNTIME, SURICATA_DEINIT);
#ifdef __SC_CUDA_SUPPORT__
SCCudaPBKillBatchingPackets();
#endif
TmThreadKillThreads();
SCPerfReleaseResources();
FlowShutdown(); FlowShutdown();
FlowPrintQueueInfo(); FlowPrintQueueInfo();
StreamTcpFreeConfig(STREAM_VERBOSE); StreamTcpFreeConfig(STREAM_VERBOSE);

Loading…
Cancel
Save