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

GH-773: Make EventMgr an IOSource so that events interrupt kevent waits

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-02-04 12:58:55 -07:00
parent 5171f25e3a
commit 4f23c0360a
6 changed files with 59 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/iosource/Manager.cc
View file

@ -58,9 +58,13 @@ Manager::~Manager()
for ( SourceList::iterator i = sources.begin(); i != sources.end(); ++i )
{
(*i)->src->Done();
delete (*i)->src;
delete *i;
auto src = *i;
src->src->Done();
if ( src->manage_lifetime )
delete src->src;
delete src;
}
sources.clear();
@ -152,6 +156,9 @@ void Manager::FindReadySources(std::vector<IOSource*>* ready)
}
}
DBG_LOG(DBG_MAINLOOP, "timeout: %f ready size: %ld time_to_poll: %d\n",
timeout, ready->size(), time_to_poll);
// If we didn't find any IOSources with zero timeouts or it's time to
// force a poll, do that and return. Otherwise return the set of ready
// sources that we have.
@ -253,7 +260,7 @@ bool Manager::UnregisterFd(int fd, IOSource* src)
}
}
void Manager::Register(IOSource* src, bool dont_count)
void Manager::Register(IOSource* src, bool dont_count, bool manage_lifetime)
{
// First see if we already have registered that source. If so, just
// adjust dont_count.
@ -273,6 +280,7 @@ void Manager::Register(IOSource* src, bool dont_count)
Source* s = new Source;
s->src = src;
s->dont_count = dont_count;
s->manage_lifetime = manage_lifetime;
if ( dont_count )
++dont_counts;