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

BIT-1408: improve I/O loop and Broker IOSource.

Browse source
This commit is contained in:
Jon Siwek 2015-06-03 08:25:49 -05:00
parent a6618eb964
commit 58ea1ff458
4 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/broker/Manager.cc
View file

@ -24,6 +24,12 @@ int bro_broker::Manager::send_flags_self_idx;
int bro_broker::Manager::send_flags_peers_idx;
int bro_broker::Manager::send_flags_unsolicited_idx;
bro_broker::Manager::Manager()
: iosource::IOSource(), next_timestamp(-1)
{
SetIdle(true);
}
bro_broker::Manager::~Manager()
{
vector<decltype(data_stores)::key_type> stores_to_close;
@ -560,8 +566,10 @@ void bro_broker::Manager::GetFds(iosource::FD_Set* read, iosource::FD_Set* write
double bro_broker::Manager::NextTimestamp(double* local_network_time)
{
// TODO: do something better?
return timer_mgr->Time();
if ( next_timestamp < 0 )
next_timestamp = timer_mgr->Time();
return next_timestamp;
}
struct response_converter {
@ -619,7 +627,6 @@ static RecordVal* response_to_val(broker::store::response r)
void bro_broker::Manager::Process()
{
bool idle = true;
auto outgoing_connection_updates =
endpoint->outgoing_connection_status().want_pop();
auto incoming_connection_updates =
@ -630,8 +637,6 @@ void bro_broker::Manager::Process()
for ( auto& u : outgoing_connection_updates )
{
idle = false;
switch ( u.status ) {
case broker::outgoing_connection_status::tag::established:
if ( BrokerComm::outgoing_connection_established )
@ -677,8 +682,6 @@ void bro_broker::Manager::Process()
for ( auto& u : incoming_connection_updates )
{
idle = false;
switch ( u.status ) {
case broker::incoming_connection_status::tag::established:
if ( BrokerComm::incoming_connection_established )
@ -714,7 +717,6 @@ void bro_broker::Manager::Process()
continue;
ps.second.received += print_messages.size();
idle = false;
if ( ! BrokerComm::print_handler )
continue;
@ -751,7 +753,6 @@ void bro_broker::Manager::Process()
continue;
es.second.received += event_messages.size();
idle = false;
for ( auto& em : event_messages )
{
@ -822,7 +823,6 @@ void bro_broker::Manager::Process()
continue;
ls.second.received += log_messages.size();
idle = false;
for ( auto& lm : log_messages )
{
@ -890,7 +890,6 @@ void bro_broker::Manager::Process()
continue;
statistics.report_count += responses.size();
idle = false;
for ( auto& response : responses )
{
@ -940,8 +939,6 @@ void bro_broker::Manager::Process()
for ( auto& report : reports )
{
idle = false;
if ( report.size() < 2 )
{
reporter->Warning("got broker report msg of size %zu, expect 4",
@ -979,7 +976,7 @@ void bro_broker::Manager::Process()
}
}
SetIdle(idle);
next_timestamp = -1;
}
bool bro_broker::Manager::AddStore(StoreHandleVal* handle)

6
src/broker/Manager.h
View file

@ -50,6 +50,11 @@ class Manager : public iosource::IOSource {
friend class StoreHandleVal;
public:
/**
* Constructor.
*/
Manager();
/**
* Destructor. Any still-pending data store queries are aborted.
*/
@ -351,6 +356,7 @@ private:
std::unordered_set<StoreQueryCallback*> pending_queries;
Stats statistics;
double next_timestamp;
static VectorType* vector_of_data_type;
static EnumType* log_id_type;

3
src/iosource/Manager.cc
View file

@ -118,9 +118,6 @@ IOSource* Manager::FindSoonest(double* ts)
src->Clear();
src->src->GetFds(&src->fd_read, &src->fd_write, &src->fd_except);
if ( src->fd_read.Empty() ) src->fd_read.Insert(0);
if ( src->fd_write.Empty() ) src->fd_write.Insert(0);
if ( src->fd_except.Empty() ) src->fd_except.Insert(0);
src->SetFds(&fd_read, &fd_write, &fd_except, &maxx);
}

7
src/iosource/PktSrc.cc
View file

@ -240,6 +240,13 @@ void PktSrc::GetFds(iosource::FD_Set* read, iosource::FD_Set* write,
if ( IsOpen() && props.selectable_fd >= 0 )
read->Insert(props.selectable_fd);
// TODO: This seems like a hack that should be removed, but doing so
// causes the main run loop to spin more frequently and increase cpu usage.
// See also commit 9cd85be308.
if ( read->Empty() ) read->Insert(0);
if ( write->Empty() ) write->Insert(0);
if ( except->Empty() ) except->Insert(0);
}
double PktSrc::NextTimestamp(double* local_network_time)