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

Merge remote-tracking branch 'origin/topic/vern/event-trace-on-exit'

Browse source 
* origin/topic/vern/event-trace-on-exit:
  Generate --event-trace output explicitly rather than in EventTraceMgr destructor
This commit is contained in:
Arne Welzel 2025-05-16 13:39:56 +02:00
commit 4691e2c51b
5 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
8.0.0-dev.106 | 2025-05-16 13:39:56 +0200
* Generate --event-trace output explicitly rather than in EventTraceMgr destructor (Vern Paxson, Corelight)
8.0.0-dev.104 | 2025-05-15 12:15:42 -0700 8.0.0-dev.104 | 2025-05-15 12:15:42 -0700
* Require non-system version of libkrb5 on macOS (Tim Wojtulewicz, Corelight) * Require non-system version of libkrb5 on macOS (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.104 8.0.0-dev.106

2
src/EventTrace.cc
View file

@ -958,7 +958,7 @@ EventTraceMgr::EventTraceMgr(const std::string& trace_file) {
reporter->FatalError("can't open event trace file %s", trace_file.c_str()); reporter->FatalError("can't open event trace file %s", trace_file.c_str());
} }
EventTraceMgr::~EventTraceMgr() { void EventTraceMgr::Generate() {
if ( events.empty() ) if ( events.empty() )
return; return;

4
src/EventTrace.h
View file

@ -440,7 +440,9 @@ private:
class EventTraceMgr { class EventTraceMgr {
public: public:
EventTraceMgr(const std::string& trace_file); EventTraceMgr(const std::string& trace_file);
~EventTraceMgr();
// Generates the trace upon exit.
void Generate();
// Called at the beginning of invoking an event's handlers. // Called at the beginning of invoking an event's handlers.
void StartEvent(const ScriptFunc* ev, const zeek::Args* args); void StartEvent(const ScriptFunc* ev, const zeek::Args* args);

3
src/zeek-setup.cc
View file

@ -399,6 +399,9 @@ static void terminate_zeek() {
script_coverage_mgr.WriteStats(); script_coverage_mgr.WriteStats();
if ( etm )
etm->Generate();
delete zeekygen_mgr; delete zeekygen_mgr;
delete packet_mgr; delete packet_mgr;
delete analyzer_mgr; delete analyzer_mgr;