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

Event: No need to be Obj

Browse source 
It's not fully clear to me why Event needs to be an Obj. Not
inheriting from Obj avoids needing a vtable and allows to skip
the Obj constructor and destructor for a bit of a performance
improvement in microbenchmarks.

Open-code Ref() and Unref() to keep the HookQueueEvent() API
stable for plugins that took charge of the Event (and need to free/unref it).
This commit is contained in:
Arne Welzel 2025-03-27 15:35:34 +01:00
parent ebb00d37bc
commit d163820d79
2 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Event.cc
View file

@ -4,7 +4,6 @@
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/Trigger.h" #include "zeek/Trigger.h"
#include "zeek/Val.h"
#include "zeek/iosource/Manager.h" #include "zeek/iosource/Manager.h"
#include "zeek/plugin/Manager.h" #include "zeek/plugin/Manager.h"
@ -16,7 +15,8 @@ namespace zeek {
Event::Event(const EventHandlerPtr& arg_handler, zeek::Args arg_args, util::detail::SourceID arg_src, 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) analyzer::ID arg_aid, Obj* arg_obj, double arg_ts)
: handler(arg_handler), : ref_cnt(1),
handler(arg_handler),
args(std::move(arg_args)), args(std::move(arg_args)),
src(arg_src), src(arg_src),
aid(arg_aid), aid(arg_aid),
@ -27,20 +27,6 @@ Event::Event(const EventHandlerPtr& arg_handler, zeek::Args arg_args, util::deta
Ref(obj); Ref(obj);
} }
void Event::Describe(ODesc* d) const {
if ( d->IsReadable() )
d->AddSP("event");
bool s = d->IsShort();
d->SetShort(s);
if ( ! d->IsBinary() )
d->Add("(");
describe_vals(args, d);
if ( ! d->IsBinary() )
d->Add("(");
}
void Event::Dispatch(bool no_remote) { void Event::Dispatch(bool no_remote) {
if ( src == util::detail::SOURCE_BROKER ) if ( src == util::detail::SOURCE_BROKER )
no_remote = true; no_remote = true;

15
src/Event.h
View file

@ -17,8 +17,9 @@ extern double network_time;
} // namespace run_state } // namespace run_state
class EventMgr; class EventMgr;
class Event;
class Event final : public Obj { class Event final {
public: public:
Event(const EventHandlerPtr& handler, zeek::Args args, util::detail::SourceID src = util::detail::SOURCE_LOCAL, Event(const EventHandlerPtr& handler, zeek::Args args, util::detail::SourceID src = util::detail::SOURCE_LOCAL,
analyzer::ID aid = 0, Obj* obj = nullptr, double ts = run_state::network_time); analyzer::ID aid = 0, Obj* obj = nullptr, double ts = run_state::network_time);
@ -32,15 +33,16 @@ public:
const zeek::Args& Args() const { return args; } const zeek::Args& Args() const { return args; }
double Time() const { return ts; } double Time() const { return ts; }
void Describe(ODesc* d) const override;
private: private:
friend class EventMgr; friend class EventMgr;
friend void inline Ref(Event*);
friend inline void Unref(Event*);
// This method is protected to make sure that everybody goes through // This method is protected to make sure that everybody goes through
// EventMgr::Dispatch(). // EventMgr::Dispatch().
void Dispatch(bool no_remote = false); void Dispatch(bool no_remote = false);
int ref_cnt;
EventHandlerPtr handler; EventHandlerPtr handler;
zeek::Args args; zeek::Args args;
util::detail::SourceID src; util::detail::SourceID src;
@ -50,6 +52,13 @@ private:
Event* next_event; Event* next_event;
}; };
inline void Unref(Event* e) {
if ( e && --e->ref_cnt <= 0 )
delete e;
}
inline void Ref(Event* e) { ++(e->ref_cnt); }
class EventMgr final : public iosource::IOSource { class EventMgr final : public iosource::IOSource {
public: public:
~EventMgr() override; ~EventMgr() override;