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

iomanager: Collect all sources with zero timeouts as ready

Browse source 
Previously, if two iosources returned 0.0 as their timeout, only
one of them would be considered ready. An always ready source
therefore may starve other ready ones due to this and minimally
this behavior seems surprising.

Offline pcap sources are always ready and return 0.0 for
GetNextTimeout() (unless in pseudo-realtime), so we can
also remove the offline source special case.

One subtle side-effect of this change is that if an IO source
returns a 0.0 timeout *and* it's file descriptor is ready in
the same loop iteration, it may be processed twice.
This commit is contained in:
Arne Welzel 2023-03-14 13:11:59 +01:00
parent 5cba1e0b09
commit f3fcaf776c
1 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/iosource/Manager.cc
View file

@ -157,25 +157,24 @@ void Manager::FindReadySources(ReadySources* ready)
if ( iosource->IsOpen() )
{
double next = iosource->GetNextTimeout();
bool added = false;
if ( timeout == -1 || (next >= 0.0 && next < timeout) )
{
timeout = next;
timeout_src = iosource;
// If a source has a zero timeout then it's ready. Just add it to the
// list already. Only do this if it's not time to poll though, since
// we don't want things in the vector passed into Poll() or it'll end
// up inserting duplicates.
if ( timeout == 0 && ! time_to_poll )
{
added = true;
ready->push_back({timeout_src, -1, 0});
}
}
if ( iosource == pkt_src && ! added )
// If a source has a zero timeout then it's ready. Just add it to the
// list already. Only do this if it's not time to poll though, since
// we don't want things in the vector passed into Poll() or it'll end
// up inserting duplicates. A source with a zero timeout that was not
// selected as the timeout_src can be safely added, whether it's time
// to poll or not though.
if ( next == 0 && (! time_to_poll || iosource != timeout_src) )
{
ready->push_back({iosource, -1, 0});
}
else if ( iosource == pkt_src )
{
if ( pkt_src->IsLive() )
{
@ -185,12 +184,6 @@ void Manager::FindReadySources(ReadySources* ready)
// Poll() and end up dropping packets.
ready->push_back({pkt_src, -1, 0});
}
else
{
if ( ! run_state::pseudo_realtime && ! time_to_poll )
// A pcap file is always ready to process unless it's suspended
ready->push_back({pkt_src, -1, 0});
}
}
}
}