mirror of
https://github.com/zeek/zeek.git
synced 2025-10-08 01:28:20 +00:00
Reformat Zeek in Spicy style
This largely copies over Spicy's `.clang-format` configuration file. The one place where we deviate is header include order since Zeek depends on headers being included in a certain order.
This commit is contained in:
Benjamin Bannier
parent
7b8e7ed72c
commit
f5a76c1aed
786 changed files with 131714 additions and 153609 deletions
309
src/Event.cc
309
src/Event.cc
|
|
@ -15,204 +15,187 @@
|
|||
|
||||
zeek::EventMgr zeek::event_mgr;
|
||||
|
||||
namespace zeek
|
||||
{
|
||||
namespace zeek {
|
||||
|
||||
Event::Event(const EventHandlerPtr& arg_handler, zeek::Args arg_args,
|
||||
util::detail::SourceID arg_src, analyzer::ID arg_aid, Obj* arg_obj, double arg_ts)
|
||||
: handler(arg_handler), args(std::move(arg_args)), src(arg_src), aid(arg_aid), ts(arg_ts),
|
||||
obj(arg_obj), next_event(nullptr)
|
||||
{
|
||||
if ( obj )
|
||||
Ref(obj);
|
||||
}
|
||||
Event::Event(const EventHandlerPtr& arg_handler, zeek::Args arg_args, util::detail::SourceID arg_src,
|
||||
analyzer::ID arg_aid, Obj* arg_obj, double arg_ts)
|
||||
: handler(arg_handler),
|
||||
args(std::move(arg_args)),
|
||||
src(arg_src),
|
||||
aid(arg_aid),
|
||||
ts(arg_ts),
|
||||
obj(arg_obj),
|
||||
next_event(nullptr) {
|
||||
if ( obj )
|
||||
Ref(obj);
|
||||
}
|
||||
|
||||
void Event::Describe(ODesc* d) const
|
||||
{
|
||||
if ( d->IsReadable() )
|
||||
d->AddSP("event");
|
||||
void Event::Describe(ODesc* d) const {
|
||||
if ( d->IsReadable() )
|
||||
d->AddSP("event");
|
||||
|
||||
bool s = d->IsShort();
|
||||
d->SetShort(s);
|
||||
bool s = d->IsShort();
|
||||
d->SetShort(s);
|
||||
|
||||
if ( ! d->IsBinary() )
|
||||
d->Add("(");
|
||||
describe_vals(args, d);
|
||||
if ( ! d->IsBinary() )
|
||||
d->Add("(");
|
||||
}
|
||||
if ( ! d->IsBinary() )
|
||||
d->Add("(");
|
||||
describe_vals(args, d);
|
||||
if ( ! d->IsBinary() )
|
||||
d->Add("(");
|
||||
}
|
||||
|
||||
void Event::Dispatch(bool no_remote)
|
||||
{
|
||||
if ( src == util::detail::SOURCE_BROKER )
|
||||
no_remote = true;
|
||||
void Event::Dispatch(bool no_remote) {
|
||||
if ( src == util::detail::SOURCE_BROKER )
|
||||
no_remote = true;
|
||||
|
||||
if ( handler->ErrorHandler() )
|
||||
reporter->BeginErrorHandler();
|
||||
if ( handler->ErrorHandler() )
|
||||
reporter->BeginErrorHandler();
|
||||
|
||||
try
|
||||
{
|
||||
handler->Call(&args, no_remote, ts);
|
||||
}
|
||||
try {
|
||||
handler->Call(&args, no_remote, ts);
|
||||
}
|
||||
|
||||
catch ( InterpreterException& e )
|
||||
{
|
||||
// Already reported.
|
||||
}
|
||||
catch ( InterpreterException& e ) {
|
||||
// Already reported.
|
||||
}
|
||||
|
||||
if ( obj )
|
||||
// obj->EventDone();
|
||||
Unref(obj);
|
||||
if ( obj )
|
||||
// obj->EventDone();
|
||||
Unref(obj);
|
||||
|
||||
if ( handler->ErrorHandler() )
|
||||
reporter->EndErrorHandler();
|
||||
}
|
||||
if ( handler->ErrorHandler() )
|
||||
reporter->EndErrorHandler();
|
||||
}
|
||||
|
||||
EventMgr::EventMgr()
|
||||
{
|
||||
head = tail = nullptr;
|
||||
current_src = util::detail::SOURCE_LOCAL;
|
||||
current_aid = 0;
|
||||
current_ts = 0;
|
||||
src_val = nullptr;
|
||||
draining = false;
|
||||
}
|
||||
EventMgr::EventMgr() {
|
||||
head = tail = nullptr;
|
||||
current_src = util::detail::SOURCE_LOCAL;
|
||||
current_aid = 0;
|
||||
current_ts = 0;
|
||||
src_val = nullptr;
|
||||
draining = false;
|
||||
}
|
||||
|
||||
EventMgr::~EventMgr()
|
||||
{
|
||||
while ( head )
|
||||
{
|
||||
Event* n = head->NextEvent();
|
||||
Unref(head);
|
||||
head = n;
|
||||
}
|
||||
EventMgr::~EventMgr() {
|
||||
while ( head ) {
|
||||
Event* n = head->NextEvent();
|
||||
Unref(head);
|
||||
head = n;
|
||||
}
|
||||
|
||||
Unref(src_val);
|
||||
}
|
||||
Unref(src_val);
|
||||
}
|
||||
|
||||
void EventMgr::Enqueue(const EventHandlerPtr& h, Args vl, util::detail::SourceID src,
|
||||
analyzer::ID aid, Obj* obj, double ts)
|
||||
{
|
||||
QueueEvent(new Event(h, std::move(vl), src, aid, obj, ts));
|
||||
}
|
||||
void EventMgr::Enqueue(const EventHandlerPtr& h, Args vl, util::detail::SourceID src, analyzer::ID aid, Obj* obj,
|
||||
double ts) {
|
||||
QueueEvent(new Event(h, std::move(vl), src, aid, obj, ts));
|
||||
}
|
||||
|
||||
void EventMgr::QueueEvent(Event* event)
|
||||
{
|
||||
bool done = PLUGIN_HOOK_WITH_RESULT(HOOK_QUEUE_EVENT, HookQueueEvent(event), false);
|
||||
void EventMgr::QueueEvent(Event* event) {
|
||||
bool done = PLUGIN_HOOK_WITH_RESULT(HOOK_QUEUE_EVENT, HookQueueEvent(event), false);
|
||||
|
||||
if ( done )
|
||||
return;
|
||||
if ( done )
|
||||
return;
|
||||
|
||||
if ( ! head )
|
||||
{
|
||||
head = tail = event;
|
||||
queue_flare.Fire();
|
||||
}
|
||||
else
|
||||
{
|
||||
tail->SetNext(event);
|
||||
tail = event;
|
||||
}
|
||||
if ( ! head ) {
|
||||
head = tail = event;
|
||||
queue_flare.Fire();
|
||||
}
|
||||
else {
|
||||
tail->SetNext(event);
|
||||
tail = event;
|
||||
}
|
||||
|
||||
++event_mgr.num_events_queued;
|
||||
}
|
||||
++event_mgr.num_events_queued;
|
||||
}
|
||||
|
||||
void EventMgr::Dispatch(Event* event, bool no_remote)
|
||||
{
|
||||
current_src = event->Source();
|
||||
current_aid = event->Analyzer();
|
||||
current_ts = event->Time();
|
||||
event->Dispatch(no_remote);
|
||||
Unref(event);
|
||||
}
|
||||
void EventMgr::Dispatch(Event* event, bool no_remote) {
|
||||
current_src = event->Source();
|
||||
current_aid = event->Analyzer();
|
||||
current_ts = event->Time();
|
||||
event->Dispatch(no_remote);
|
||||
Unref(event);
|
||||
}
|
||||
|
||||
void EventMgr::Drain()
|
||||
{
|
||||
if ( event_queue_flush_point )
|
||||
Enqueue(event_queue_flush_point, Args{});
|
||||
void EventMgr::Drain() {
|
||||
if ( event_queue_flush_point )
|
||||
Enqueue(event_queue_flush_point, Args{});
|
||||
|
||||
detail::SegmentProfiler prof(detail::segment_logger, "draining-events");
|
||||
detail::SegmentProfiler prof(detail::segment_logger, "draining-events");
|
||||
|
||||
PLUGIN_HOOK_VOID(HOOK_DRAIN_EVENTS, HookDrainEvents());
|
||||
PLUGIN_HOOK_VOID(HOOK_DRAIN_EVENTS, HookDrainEvents());
|
||||
|
||||
draining = true;
|
||||
draining = true;
|
||||
|
||||
// Past Zeek versions drained as long as there events, including when
|
||||
// a handler queued new events during its execution. This could lead
|
||||
// to endless loops in case a handler kept triggering its own event.
|
||||
// We now limit this to just a couple of rounds. We do more than
|
||||
// just one round to make it less likely to break existing scripts
|
||||
// that expect the old behavior to trigger something quickly.
|
||||
// Past Zeek versions drained as long as there events, including when
|
||||
// a handler queued new events during its execution. This could lead
|
||||
// to endless loops in case a handler kept triggering its own event.
|
||||
// We now limit this to just a couple of rounds. We do more than
|
||||
// just one round to make it less likely to break existing scripts
|
||||
// that expect the old behavior to trigger something quickly.
|
||||
|
||||
for ( int round = 0; head && round < 2; round++ )
|
||||
{
|
||||
Event* current = head;
|
||||
head = nullptr;
|
||||
tail = nullptr;
|
||||
for ( int round = 0; head && round < 2; round++ ) {
|
||||
Event* current = head;
|
||||
head = nullptr;
|
||||
tail = nullptr;
|
||||
|
||||
while ( current )
|
||||
{
|
||||
Event* next = current->NextEvent();
|
||||
while ( current ) {
|
||||
Event* next = current->NextEvent();
|
||||
|
||||
current_src = current->Source();
|
||||
current_aid = current->Analyzer();
|
||||
current_ts = current->Time();
|
||||
current->Dispatch();
|
||||
Unref(current);
|
||||
current_src = current->Source();
|
||||
current_aid = current->Analyzer();
|
||||
current_ts = current->Time();
|
||||
current->Dispatch();
|
||||
Unref(current);
|
||||
|
||||
++event_mgr.num_events_dispatched;
|
||||
current = next;
|
||||
}
|
||||
}
|
||||
++event_mgr.num_events_dispatched;
|
||||
current = next;
|
||||
}
|
||||
}
|
||||
|
||||
// Note: we might eventually need a general way to specify things to
|
||||
// do after draining events.
|
||||
draining = false;
|
||||
// Note: we might eventually need a general way to specify things to
|
||||
// do after draining events.
|
||||
draining = false;
|
||||
|
||||
// Make sure all of the triggers get processed every time the events
|
||||
// drain.
|
||||
detail::trigger_mgr->Process();
|
||||
}
|
||||
// Make sure all of the triggers get processed every time the events
|
||||
// drain.
|
||||
detail::trigger_mgr->Process();
|
||||
}
|
||||
|
||||
void EventMgr::Describe(ODesc* d) const
|
||||
{
|
||||
int n = 0;
|
||||
Event* e;
|
||||
for ( e = head; e; e = e->NextEvent() )
|
||||
++n;
|
||||
void EventMgr::Describe(ODesc* d) const {
|
||||
int n = 0;
|
||||
Event* e;
|
||||
for ( e = head; e; e = e->NextEvent() )
|
||||
++n;
|
||||
|
||||
d->AddCount(n);
|
||||
d->AddCount(n);
|
||||
|
||||
for ( e = head; e; e = e->NextEvent() )
|
||||
{
|
||||
e->Describe(d);
|
||||
d->NL();
|
||||
}
|
||||
}
|
||||
for ( e = head; e; e = e->NextEvent() ) {
|
||||
e->Describe(d);
|
||||
d->NL();
|
||||
}
|
||||
}
|
||||
|
||||
void EventMgr::Process()
|
||||
{
|
||||
queue_flare.Extinguish();
|
||||
void EventMgr::Process() {
|
||||
queue_flare.Extinguish();
|
||||
|
||||
// While it semes like the most logical thing to do, we dont want
|
||||
// to call Drain() as part of this method. It will get called at
|
||||
// the end of net_run after all of the sources have been processed
|
||||
// and had the opportunity to spawn new events.
|
||||
}
|
||||
// While it semes like the most logical thing to do, we dont want
|
||||
// to call Drain() as part of this method. It will get called at
|
||||
// the end of net_run after all of the sources have been processed
|
||||
// and had the opportunity to spawn new events.
|
||||
}
|
||||
|
||||
void EventMgr::InitPostScript()
|
||||
{
|
||||
iosource_mgr->Register(this, true, false);
|
||||
if ( ! iosource_mgr->RegisterFd(queue_flare.FD(), this) )
|
||||
reporter->FatalError("Failed to register event manager FD with iosource_mgr");
|
||||
}
|
||||
void EventMgr::InitPostScript() {
|
||||
iosource_mgr->Register(this, true, false);
|
||||
if ( ! iosource_mgr->RegisterFd(queue_flare.FD(), this) )
|
||||
reporter->FatalError("Failed to register event manager FD with iosource_mgr");
|
||||
}
|
||||
|
||||
void EventMgr::InitPostFork()
|
||||
{
|
||||
// Re-initialize the flare, closing and re-opening the underlying
|
||||
// pipe FDs. This is needed so that each Zeek process in a supervisor
|
||||
// setup has its own pipe instead of them all sharing a single pipe.
|
||||
queue_flare = zeek::detail::Flare{};
|
||||
}
|
||||
void EventMgr::InitPostFork() {
|
||||
// Re-initialize the flare, closing and re-opening the underlying
|
||||
// pipe FDs. This is needed so that each Zeek process in a supervisor
|
||||
// setup has its own pipe instead of them all sharing a single pipe.
|
||||
queue_flare = zeek::detail::Flare{};
|
||||
}
|
||||
|
||||
} // namespace zeek
|
||||
} // namespace zeek
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue