StatNode: Rename StatNode::size to StatNode::getNumberOfChildren

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/pdns/dnsdistdist/dnsdist-lua-inspection-ffi.cc b/pdns/dnsdistdist/dnsdist-lua-inspection-ffi.cc
index 78ac1081a965da54a3525dae98f6a7cdb7188217..5015d4ac748632522b9deb3aeff5ddc1d7c2945e 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-lua-inspection-ffi.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-inspection-ffi.cc
@@ -75,7 +75,7 @@ void dnsdist_ffi_stat_node_get_full_name_raw(const dnsdist_ffi_stat_node_t* node
 
 unsigned int dnsdist_ffi_stat_node_get_children_count(const dnsdist_ffi_stat_node_t* node)
 {
-  return node->node.size();
+  return node->node.getNumberOfChildren();
 }
 
 uint64_t dnsdist_ffi_stat_node_get_children_queries_count(const dnsdist_ffi_stat_node_t* node)

diff --git a/pdns/dnsdistdist/dnsdist-lua-inspection.cc b/pdns/dnsdistdist/dnsdist-lua-inspection.cc
index a01c6f8a6e78b9ed804014f487005d9044dda49a..2b54df8797f728022d89e3bd33933aa7be9bc36b 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-lua-inspection.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-inspection.cc
@@ -900,7 +900,7 @@ void setupLuaInspection(LuaContext& luaCtx)
   /* StatNode */
   luaCtx.registerFunction<unsigned int (StatNode::*)() const>("numChildren",
                                                               [](const StatNode& node) -> unsigned int {
-                                                                return node.size();
+                                                                return node.getNumberOfChildren();
                                                               });
   luaCtx.registerMember<std::string(StatNode::*)>(std::string("fullname"), [](const StatNode& node) -> std::string {
     /* we are not using toLogString() because we want:

diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc
index 4c995340d215629fdf1522573810d3f250cf0054..f948c677cb2c937b9b92bcaa45f41df880a8e25a 100644 (file)
--- a/pdns/dnsscope.cc
+++ b/pdns/dnsscope.cc
@@ -116,11 +116,11 @@ static void visitor(const StatNode* node, const StatNode::Stat& /* selfstat */,
 {
   // 20% servfails, >100 children, on average less than 2 copies of a query
   // >100 different subqueries
-  double dups=1.0*childstat.queries/node->size();
+  double dups=1.0*childstat.queries/node->getNumberOfChildren();
   if(dups > 2.0)
     return;
-  if(1.0*childstat.servfails / childstat.queries > 0.2 && node->size()>100) {
-    cout<<node->fullname<<", servfails: "<<childstat.servfails<<", nxdomains: "<<childstat.nxdomains<<", remotes: "<<childstat.remotes.size()<<", children: "<<node->size()<<", childstat.queries: "<<childstat.queries;
+  if(1.0*childstat.servfails / childstat.queries > 0.2 && node->getNumberOfChildren()>100) {
+    cout<<node->fullname<<", servfails: "<<childstat.servfails<<", nxdomains: "<<childstat.nxdomains<<", remotes: "<<childstat.remotes.size()<<", children: "<<node->getNumberOfChildren()<<", childstat.queries: "<<childstat.queries;
     cout<<", dups2: "<<dups<<endl;
     for(const StatNode::Stat::remotes_t::value_type& rem :  childstat.remotes) {
       cout<<"source: "<<node->fullname<<"\t"<<rem.first.toString()<<"\t"<<rem.second<<endl;

diff --git a/pdns/statnode.hh b/pdns/statnode.hh
index c2da59c022830f2eb280847a831ca0fd7a159e14..9d8e028f1cd100536b5f768cfb539ffdc6fdc87f 100644 (file)
--- a/pdns/statnode.hh
+++ b/pdns/statnode.hh
@@ -67,11 +67,11 @@ public:
   void submit(const DNSName& domain, int rcode, uint32_t bytes, bool hit, const std::optional<ComboAddress>& remote, size_t samplingRate);
   Stat print(unsigned int depth=0, Stat newstat=Stat(), bool silent=false) const;
   void visit(const visitor_t& visitor, Stat& newstat, unsigned int depth = 0) const;
-  bool empty() const
+  [[nodiscard]] bool empty() const
   {
     return children.empty() && s.remotes.empty();
   }
-  size_t size() const
+  [[nodiscard]] size_t getNumberOfChildren() const
   {
     return children.size();
   }