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

Two more tweaks to reliably terminate when reading from trace.

Browse source
This commit is contained in:
Robin Sommer 2012-04-04 10:42:50 -07:00
parent 50104d4b08
commit fe61d02a9f
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/threading/Manager.cc
View file

@ -43,6 +43,7 @@ void Manager::Terminate()
msg_threads.clear();
idle = true;
closed = true;
terminating = false;
}
@ -75,7 +76,7 @@ double Manager::NextTimestamp(double* network_time)
{
// fprintf(stderr, "N %.6f %.6f did_process=%d next_next=%.6f\n", ::network_time, timer_mgr->Time(), (int)did_process, next_beat);
if ( did_process || ::network_time > next_beat || ! next_beat )
if ( ::network_time && (did_process || ::network_time > next_beat || ! next_beat) )
// If we had something to process last time (or out heartbeat
// is due or not set yet), we want to check for more asap.
return timer_mgr->Time();