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

Cleanup/improve PList usage and Event API

Browse source 
Majority of PLists are now created as automatic/stack objects,
rather than on heap and initialized either with the known-capacity
reserved upfront or directly from an initializer_list (so there's no
wasted slack in the memory that gets allocated for lists containing
a fixed/known number of elements).

Added versions of the ConnectionEvent/QueueEvent methods that take
a val_list by value.

Added a move ctor/assign-operator to Plists to allow passing them
around without having to copy the underlying array of pointers.
This commit is contained in:
Jon Siwek 2019-04-11 19:02:13 -07:00
parent 78dcbcc71a
commit 8bc65f09ec
92 changed files with 1585 additions and 1679 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main.cc
View file

@ -284,12 +284,11 @@ void done_with_network()
if ( net_done )
{
val_list* args = new val_list;
args->append(new Val(timer_mgr->Time(), TYPE_TIME));
mgr.Drain();
// Don't propagate this event to remote clients.
mgr.Dispatch(new Event(net_done, args), true);
mgr.Dispatch(new Event(net_done,
{new Val(timer_mgr->Time(), TYPE_TIME)}),
true);
}
// Save state before expiring the remaining events/timers.
@ -341,7 +340,7 @@ void terminate_bro()
EventHandlerPtr bro_done = internal_handler("bro_done");
if ( bro_done )
mgr.QueueEvent(bro_done, new val_list);
mgr.QueueEvent(bro_done, val_list{});
timer_mgr->Expire();
mgr.Drain();
@ -1137,8 +1136,9 @@ int main(int argc, char** argv)
net_update_time(current_time());
EventHandlerPtr bro_init = internal_handler("bro_init");
if ( bro_init ) //### this should be a function
mgr.QueueEvent(bro_init, new val_list);
if ( bro_init )
mgr.QueueEvent(bro_init, val_list{});
EventRegistry::string_list* dead_handlers =
event_registry->UnusedHandlers();
@ -1190,10 +1190,10 @@ int main(int argc, char** argv)
if ( i->skipped )
continue;
val_list* vl = new val_list;
vl->append(new StringVal(i->name.c_str()));
vl->append(val_mgr->GetCount(i->include_level));
mgr.QueueEvent(bro_script_loaded, vl);
mgr.QueueEvent(bro_script_loaded, {
new StringVal(i->name.c_str()),
val_mgr->GetCount(i->include_level),
});
}
reporter->ReportViaEvents(true);