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

Add a simple FD_Set wrapper/helper class.

Browse source
This commit is contained in:
Jon Siwek 2014-09-09 16:28:04 -05:00
parent cf66bd8b69
commit 59c54a0fc6
16 changed files with 149 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/iosource/Manager.cc
View file

@ -44,15 +44,6 @@ void Manager::RemoveAll()
dont_counts = sources.size();
}
static void fd_vector_set(const std::vector<int>& fds, fd_set* set, int* max)
{
for ( size_t i = 0; i < fds.size(); ++i )
{
FD_SET(fds[i], set);
*max = ::max(fds[i], *max);
}
}
IOSource* Manager::FindSoonest(double* ts)
{
// Remove sources which have gone dry. For simplicity, we only
@ -124,14 +115,9 @@ IOSource* Manager::FindSoonest(double* ts)
// be ready.
continue;
src->fd_read.clear();
src->fd_write.clear();
src->fd_except.clear();
src->Clear();
src->src->GetFds(&src->fd_read, &src->fd_write, &src->fd_except);
fd_vector_set(src->fd_read, &fd_read, &maxx);
fd_vector_set(src->fd_write, &fd_write, &maxx);
fd_vector_set(src->fd_except, &fd_except, &maxx);
src->SetFds(&fd_read, &fd_write, &fd_except, &maxx);
}
// We can't block indefinitely even when all sources are dry:
@ -316,21 +302,10 @@ PktDumper* Manager::OpenPktDumper(const string& path, bool append)
return pd;
}
static bool fd_vector_ready(const std::vector<int>& fds, fd_set* set)
void Manager::Source::SetFds(fd_set* read, fd_set* write, fd_set* except,
int* maxx) const
{
for ( size_t i = 0; i < fds.size(); ++i )
if ( FD_ISSET(fds[i], set) )
return true;
return false;
}
bool Manager::Source::Ready(fd_set* read, fd_set* write, fd_set* except) const
{
if ( fd_vector_ready(fd_read, read) ||
fd_vector_ready(fd_write, write) ||
fd_vector_ready(fd_except, except) )
return true;
return false;
*maxx = std::max(*maxx, fd_read.Set(read));
*maxx = std::max(*maxx, fd_write.Set(write));
*maxx = std::max(*maxx, fd_except.Set(except));
}