Merge remote-tracking branch 'origin/topic/vern/ZAM-cluster-bifs'

* origin/topic/vern/ZAM-cluster-bifs:
  added new Cluster:: BiFs to script optimization tracking

CHANGES

@@ -1,3 +1,9 @@
+7.1.0-dev.649 | 2024-12-02 13:43:26 +0100
+
+  * added new Cluster:: BiFs to script optimization tracking (Vern Paxson, Corelight)
+
+  * added locations to ZAM run-time errors about vector size mismatches (Vern Paxson, Corelight)
+
 7.1.0-dev.645 | 2024-12-02 10:59:04 +0100
 
   * fixed -O dump-final-ZAM to work in conjunction with -O no-ZAM-opt (Vern Paxson, Corelight)

VERSION

@@ -1 +1 @@
-7.1.0-dev.645
+7.1.0-dev.649

src/script_opt/FuncInfo.cc

@@ -72,6 +72,11 @@ static std::unordered_map<std::string, unsigned int> func_attrs = {
     {"Analyzer::__register_for_port", ATTR_NO_SCRIPT_SIDE_EFFECTS},
     {"Analyzer::__schedule_analyzer", ATTR_NO_SCRIPT_SIDE_EFFECTS},
     {"Analyzer::__tag", ATTR_FOLDABLE},
+    {"Cluster::Backend::__init", ATTR_NO_SCRIPT_SIDE_EFFECTS},
+    {"Cluster::__subscribe", ATTR_NO_SCRIPT_SIDE_EFFECTS},
+    {"Cluster::__unsubscribe", ATTR_NO_SCRIPT_SIDE_EFFECTS},
+    {"Cluster::make_event", ATTR_NO_SCRIPT_SIDE_EFFECTS},
+    {"Cluster::publish", ATTR_NO_SCRIPT_SIDE_EFFECTS},
     {"FileExtract::__set_limit", ATTR_NO_SCRIPT_SIDE_EFFECTS},
     {"Files::__add_analyzer", ATTR_NO_SCRIPT_SIDE_EFFECTS},
     {"Files::__analyzer_enabled", ATTR_NO_ZEEK_SIDE_EFFECTS},

testing/btest/Baseline.zam/opt.ZAM-bif-tracking/output

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

testing/btest/opt/ZAM-bif-tracking.zeek

@@ -95,6 +95,11 @@ global known_BiFs = set(
 	"Broker::__vector_size",
 	"Broker::make_event",
 	"Broker::publish",
+	"Cluster::Backend::__init",
+	"Cluster::__subscribe",
+	"Cluster::__unsubscribe",
+	"Cluster::make_event",
+	"Cluster::publish",
 	"Cluster::publish_hrw",
 	"Cluster::publish_rr",
 	"FileExtract::__set_limit",