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

Merge remote-tracking branch 'origin/topic/awelzel/event-trace-mgr-destructor-fclose'

Browse source 
* origin/topic/awelzel/event-trace-mgr-destructor-fclose:
  btest/core: Add event-trace test
  zeek-setup: Free event_trace_mgr after generating trace
  EventTraceMgr: Rename etm to event_trace_mgr
  EventTraceMgr: Move fclose() to destructor
This commit is contained in:
Arne Welzel 2025-05-19 20:01:30 +02:00
commit eb15997cc3
10 changed files with 65 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Expr.cc
View file

@ -3865,8 +3865,8 @@ ValPtr ScheduleExpr::Eval(Frame* f) const {
if ( args ) {
auto handler = event->Handler();
if ( etm )
etm->ScriptEventQueued(handler);
if ( event_trace_mgr )
event_trace_mgr->ScriptEventQueued(handler);
timer_mgr->Add(new ScheduleTimer(handler, std::move(*args), dt));
}
@ -4471,8 +4471,8 @@ ValPtr EventExpr::Eval(Frame* f) const {
auto v = eval_list(f, args.get());
if ( handler ) {
if ( etm )
etm->ScriptEventQueued(handler);
if ( event_trace_mgr )
event_trace_mgr->ScriptEventQueued(handler);
event_mgr.Enqueue(handler, std::move(*v));
}