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

Reworking forceful thread termination.

Browse source 
Ctrl-C now kills a thread even if it hangs at termination. And readded
a (rather long) timeout to kill threads automatically that don't
shutdown.
This commit is contained in:
Robin Sommer 2012-07-17 19:36:30 -07:00
parent e90918aa50
commit 490859cfef
6 changed files with 50 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/logging/WriterBackend.cc
View file

@ -162,9 +162,7 @@ bool WriterBackend::Init(const WriterInfo& arg_info, int arg_num_fields, const F
num_fields = arg_num_fields;
fields = arg_fields;
string name = Fmt("%s/%s", info.path.c_str(), frontend_name.c_str());
SetName(name);
SetName(frontend->Name());
if ( ! DoInit(arg_info, arg_num_fields, arg_fields) )
{

1
src/logging/writers/Ascii.cc
View file

@ -169,6 +169,7 @@ bool Ascii::DoFinish(double network_time)
ascii_done = true;
CloseFile(network_time);
return true;
}