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/awelzel/bif-tracking-no-zeromq'

Browse source 
* origin/topic/awelzel/bif-tracking-no-zeromq:
  ZAM-bif-tracking: Remove ZeroMQ dependency
This commit is contained in:
Arne Welzel 2025-04-30 17:23:06 +02:00
commit f8b75426ee
4 changed files with 16 additions and 4 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.17 | 2025-04-30 17:23:06 +0200
* ZAM-bif-tracking: Remove ZeroMQ dependency (Arne Welzel, Corelight)
8.0.0-dev.15 | 2025-04-29 17:50:31 -0700 8.0.0-dev.15 | 2025-04-29 17:50:31 -0700
* fixed incorrect ZAM optimization of expressions seen in single-statement inlined functions (Vern Paxson, Corelight) * fixed incorrect ZAM optimization of expressions seen in single-statement inlined functions (Vern Paxson, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.15 8.0.0-dev.17

2
testing/btest/Baseline/opt.ZAM-bif-tracking/output
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
559 seen BiFs, 0 unseen BiFs (), 0 new BiFs () 558 seen BiFs, 0 unseen BiFs (), 0 new BiFs ()

12
testing/btest/opt/ZAM-bif-tracking.zeek
View file

@ -1,7 +1,6 @@
# @TEST-DOC: ZAM maintenance script for tracking changes in BiFs. # @TEST-DOC: ZAM maintenance script for tracking changes in BiFs.
# #
# @TEST-REQUIRES: have-spicy # @TEST-REQUIRES: have-spicy
# @TEST-REQUIRES: have-zeromq
# #
# @TEST-EXEC: zeek -b %INPUT >output # @TEST-EXEC: zeek -b %INPUT >output
# @TEST-EXEC: btest-diff output # @TEST-EXEC: btest-diff output
@ -213,7 +212,6 @@ global known_BiFs = set(
"Telemetry::__histogram_observe", "Telemetry::__histogram_observe",
"Telemetry::__histogram_sum", "Telemetry::__histogram_sum",
"WebSocket::__configure_analyzer", "WebSocket::__configure_analyzer",
"Cluster::Backend::ZeroMQ::spawn_zmq_proxy_thread",
"__init_primary_bifs", "__init_primary_bifs",
"__init_secondary_bifs", "__init_secondary_bifs",
"active_file", "active_file",
@ -585,6 +583,13 @@ function fmt_str_set(s: set[string]): string
return set_str; return set_str;
} }
const ignored_module_patterns: table[pattern] of bool = {
# ZeroMQ is only an optional dependency and the BiFs it
# provides aren't performance critical, ignore it.
[/^Cluster::Backend::ZeroMQ.*/] = T,
};
event zeek_init() event zeek_init()
{ {
local unseen_bifs = known_BiFs; local unseen_bifs = known_BiFs;
@ -597,6 +602,9 @@ event zeek_init()
# format to that plus their body. # format to that plus their body.
fmt("%s", gi$value) == gn ) fmt("%s", gi$value) == gn )
{ {
if ( |ignored_module_patterns[gn]| > 0 )
next;
if ( gn in unseen_bifs ) if ( gn in unseen_bifs )
{ {
add seen_bifs[gn]; add seen_bifs[gn];