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

BIT-1885: fix "kill" threading message

Browse source 
Now goes through the proper (main thread) channels to signal the
thread to stop.
This commit is contained in:
Jon Siwek 2018-08-23 16:48:49 -05:00
parent b9dfca7789
commit af181474c1
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/threading/MsgThread.cc
View file

@ -94,16 +94,10 @@ public:
virtual bool Process() virtual bool Process()
{ {
auto rval = true; Object()->SignalStop();
Object()->WaitForStop();
if ( ! Object()->child_finished )
{
rval = Object()->OnFinish(network_time);
Object()->Finished();
}
thread_mgr->KillThread(Object()); thread_mgr->KillThread(Object());
return rval; return true;
} }
}; };