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

Remove TimerMgr arg from event queuing/scheduling methods

Browse source 
It's not useful for anything since there's only ever a single TimerMgr.
This commit is contained in:
Jon Siwek 2020-03-25 19:05:17 -07:00
parent 5e496e43b7
commit 54bc3bd5c6
6 changed files with 17 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Event.h
View file

@ -17,14 +17,13 @@ class Event : public BroObj {
public:
Event(EventHandlerPtr handler, zeek::Args args,
SourceID src = SOURCE_LOCAL, analyzer::ID aid = 0,
TimerMgr* mgr = nullptr, BroObj* obj = nullptr);
BroObj* obj = nullptr);
void SetNext(Event* n) { next_event = n; }
Event* NextEvent() const { return next_event; }
SourceID Source() const { return src; }
analyzer::ID Analyzer() const { return aid; }
TimerMgr* Mgr() const { return mgr; }
EventHandlerPtr Handler() const { return handler; }
const zeek::Args& Args() const { return args; }
@ -41,7 +40,6 @@ protected:
zeek::Args args;
SourceID src;
analyzer::ID aid;
TimerMgr* mgr;
BroObj* obj;
Event* next_event;
};
@ -101,7 +99,7 @@ public:
*/
void Enqueue(const EventHandlerPtr& h, zeek::Args vl,
SourceID src = SOURCE_LOCAL, analyzer::ID aid = 0,
TimerMgr* mgr = nullptr, BroObj* obj = nullptr);
BroObj* obj = nullptr);
/**
* A version of Enqueue() taking a variable number of arguments.
@ -127,9 +125,6 @@ public:
// non-analyzer event.
analyzer::ID CurrentAnalyzer() const { return current_aid; }
// Returns the timer mgr associated with the last raised event.
TimerMgr* CurrentTimerMgr() const { return current_mgr; }
int Size() const
{ return num_events_queued - num_events_dispatched; }
@ -147,7 +142,6 @@ protected:
Event* tail;
SourceID current_src;
analyzer::ID current_aid;
TimerMgr* current_mgr;
RecordVal* src_val;
bool draining;
bro::Flare queue_flare;