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

generate --event-trace output explicitly rather than in EventTraceMgr destructor

Browse source
This commit is contained in:
Vern Paxson 2025-05-15 12:39:18 -07:00
parent da689f1835
commit 9e5b87786d
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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;