Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 23:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

hopefully finally fix last interesting race-condition

Browse source
This commit is contained in:
Bernhard Amann 2013-05-15 15:36:34 -07:00
parent 808639fc5f
commit 37566e73d8
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/threading/MsgThread.cc
View file

@ -196,7 +196,7 @@ void MsgThread::OnWaitForStop()
uint64_t last_size = 0; uint64_t last_size = 0;
uint64_t cur_size = 0; uint64_t cur_size = 0;
while ( ! (main_finished || Killed() ) ) while ( ! main_finished )
{ {
// Terminate if we get another kill signal. // Terminate if we get another kill signal.
if ( signal_val == SIGTERM || signal_val == SIGINT ) if ( signal_val == SIGTERM || signal_val == SIGINT )
@ -221,8 +221,10 @@ void MsgThread::OnWaitForStop()
signal_val = 0; signal_val = 0;
} }
queue_in.WakeUp(); if ( !Killed() )
while ( HasOut() && !Killed() ) queue_in.WakeUp();
while ( HasOut() )
{ {
Message* msg = RetrieveOut(); Message* msg = RetrieveOut();
assert ( msg ); assert ( msg );