Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

TimerMgr: No network_time updates in Process()

Browse source 
network_time forwarding will now happen centrally in the main loop.
The TimerMgr returns a valid timeout that can be waited for and will
trigger network_time advancement, so we don't need to do it.
This commit is contained in:
Arne Welzel 2023-03-15 15:06:54 +01:00
parent 2e8176305b
commit c30b5cbc4d
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Timer.cc
View file

@ -93,14 +93,6 @@ int TimerMgr::Advance(double arg_t, int max_expire)
void TimerMgr::Process()
{
// If we don't have a source, or the source is closed, or we're reading live (which includes
// pseudo-realtime), advance the timer here to the current time since otherwise it won't
// move forward and the timers won't fire correctly.
iosource::PktSrc* pkt_src = iosource_mgr->GetPktSrc();
if ( ! pkt_src || ! pkt_src->IsOpen() || run_state::reading_live ||
run_state::is_processing_suspended() )
run_state::detail::update_network_time(util::current_time());
// Just advance the timer manager based on the current network time. This won't actually
// change the time, but will dispatch any timers that need dispatching.
run_state::current_dispatched += Advance(run_state::network_time,