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

Minor renaming changes to event handler stats bif, plus a test

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-11-11 16:32:55 -07:00
parent accac2d3bb
commit bfd5b06943
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/base/init-bare.zeek
View file

@ -797,9 +797,9 @@ type ReporterStats: record {
## .. zeek:see:: get_event_handler_call_counts ## .. zeek:see:: get_event_handler_call_counts
type EventNameCounter: record { type EventNameCounter: record {
## Name of the zeek event. ## Name of the zeek event.
name: string &log; name: string &log;
## Times it was queued, as captured by event hook. ## Times it was called, as counted by the event handlers.
times_queued: count &log; times_called: count &log;
} &log; } &log;
type EventNameStats: vector of EventNameCounter; type EventNameStats: vector of EventNameCounter;

9
src/stats.bif
View file

@ -485,17 +485,15 @@ function get_reporter_stats%(%): ReporterStats
return r; return r;
%} %}
## Returns a list of event handlers that were called and the number of times ## Returns statistics about calls to event handlers.
## each was called.
## ##
## Returns: A record with event call statistics. ## Returns: A record with event call statistics.
## ##
function get_event_handler_call_counts%(%): EventNameStats function get_event_handler_stats%(%): EventNameStats
%{ %{
auto rval = zeek::make_intrusive<zeek::VectorVal>(zeek::id::find_type<VectorType>("EventNameStats")); auto rval = zeek::make_intrusive<zeek::VectorVal>(zeek::id::find_type<VectorType>("EventNameStats"));
const auto& recordType = zeek::id::find_type<RecordType>("EventNameCounter"); const auto& recordType = zeek::id::find_type<RecordType>("EventNameCounter");
int i = 0;
const auto& events = event_registry->UsedHandlers(); const auto& events = event_registry->UsedHandlers();
for ( const auto& name : events ) for ( const auto& name : events )
{ {
@ -507,8 +505,7 @@ function get_event_handler_call_counts%(%): EventNameStats
auto eventStatRecord = zeek::make_intrusive<zeek::RecordVal>(recordType); auto eventStatRecord = zeek::make_intrusive<zeek::RecordVal>(recordType);
eventStatRecord->Assign(0, zeek::make_intrusive<zeek::StringVal>(name)); eventStatRecord->Assign(0, zeek::make_intrusive<zeek::StringVal>(name));
eventStatRecord->Assign(1, zeek::val_mgr->Count(handler->CallCount())); eventStatRecord->Assign(1, zeek::val_mgr->Count(handler->CallCount()));
rval->Assign(i, std::move(eventStatRecord)); rval->Append(std::move(eventStatRecord));
i++;
} }
} }

1
testing/btest/Baseline/bifs.event-handler-stats/out Normal file
View file

@ -0,0 +1 @@
[[name=Broker::log_flush, times_called=2], [name=ChecksumOffloading::check, times_called=2], [name=NetControl::init, times_called=1], [name=analyzer_confirmation_info, times_called=1], [name=connection_established, times_called=1], [name=connection_state_remove, times_called=1], [name=file_new, times_called=1], [name=file_over_new_connection, times_called=1], [name=file_sniff, times_called=1], [name=file_state_remove, times_called=1], [name=filter_change_tracking, times_called=3], [name=get_file_handle, times_called=4], [name=http_begin_entity, times_called=2], [name=http_end_entity, times_called=2], [name=http_header, times_called=13], [name=http_message_done, times_called=2], [name=http_reply, times_called=1], [name=http_request, times_called=1], [name=net_done, times_called=1], [name=new_connection, times_called=1], [name=run_sync_hook, times_called=2], [name=zeek_done, times_called=1], [name=zeek_init, times_called=1]]

7
testing/btest/bifs/event-handler-stats.zeek Normal file
View file

@ -0,0 +1,7 @@
# @TEST-EXEC: zeek -r $TRACES/http/get.trace %INPUT >out
# @TEST-EXEC: btest-diff out
event zeek_done()
{
print(get_event_handler_stats());
}