19364671897

Committed 14 Nov 2025 12:31PM UTC coverage: 67.787% (-5.3%) from 73.097%

Build # 19364671897

Build Type

Pull #16487

github

Committed by

web-flow

Commit Message

Merge 2855ef1b4 into e9b88b806

Pull Request Pull Request #16487: chore: Switch from boost::optional to std::optional

Run Details

32123 of 56078 branches covered (57.28%)

Branch coverage included in aggregate %.

585 of 633 new or added lines in 43 files covered. (92.42%)

10773 existing lines in 102 files now uncovered.

104861 of 146001 relevant lines covered (71.82%)

6230233.99 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

50.35

/pdns/statnode.cc

#include "statnode.hh"

StatNode::Stat StatNode::print(unsigned int depth, Stat newstat, bool silent) const
{
  if(!silent) {
    cout<<string(depth, ' ');
    cout<<name<<": "<<endl;
  }
  Stat childstat;
  childstat.queries += s.queries;
  childstat.noerrors += s.noerrors;
  childstat.nxdomains += s.nxdomains;
  childstat.servfails += s.servfails;
  childstat.drops += s.drops;
  childstat.bytes += s.bytes;
  childstat.hits += s.hits;

  if(children.size()>1024 && !silent) {
    cout<<string(depth, ' ')<<name<<": too many to print"<<endl;
  }
  for(const children_t::value_type& child :  children) {
    childstat=child.second.print(depth+8, childstat, silent || children.size()>1024);
  }
  if(!silent || children.size()>1)
    cout<<string(depth, ' ')<<childstat.queries<<" queries, " << 
      childstat.noerrors<<" noerrors, "<< 
      childstat.nxdomains<<" nxdomains, "<< 
      childstat.servfails<<" servfails, "<< 
      childstat.drops<<" drops, "<<
      childstat.bytes<<" bytes, "<<
      childstat.hits<<" hits"<<endl;

  newstat+=childstat;

  return newstat;
}

void StatNode::visit(const visitor_t& visitor, Stat& newstat, unsigned int depth) const
{
  Stat childstat(s);

  for (const auto& child : children) {
    child.second.visit(visitor, childstat, depth+8);
  }

  visitor(this, s, childstat);

  newstat += childstat;
}

void StatNode::submit(const DNSName& domain, int rcode, unsigned int bytes, bool hit, const std::optional<ComboAddress>& remote)
{
  //  cerr<<"FIRST submit called on '"<<domain<<"'"<<endl;
  std::vector<string> tmp = domain.getRawLabels();
  if (tmp.empty()) {
    return;
  }

  auto last = tmp.end() - 1;
  children[*last].submit(last, tmp.begin(), "", rcode, bytes, remote, 1, hit);
}

/* www.powerdns.com. -> 
   .                 <- fullnames
   com.
   powerdns.com
   www.powerdns.com. 
*/

void StatNode::submit(std::vector<string>::const_iterator end, std::vector<string>::const_iterator begin, const std::string& domain, int rcode, unsigned int bytes, const std::optional<ComboAddress>& remote, unsigned int count, bool hit)
{
  //  cerr<<"Submit called for domain='"<<domain<<"': ";
  //  for(const std::string& n :  labels) 
  //    cerr<<n<<".";
  //  cerr<<endl;
  if (name.empty()) {

    name=*end;
    //    cerr<<"Set short name to '"<<name<<"'"<<endl;
  }
  else {
    //    cerr<<"Short name was already set to '"<<name<<"'"<<endl;
  }

  if (end == begin) {
    if (fullname.empty()) {
      size_t needed = name.size() + 1 + domain.size();
      if (fullname.capacity() < needed) {
        fullname.reserve(needed);
      }
      fullname = name;
      fullname.append(".");
      fullname.append(domain);
      labelsCount = count;
    }
    //    cerr<<"Hit the end, set our fullname to '"<<fullname<<"'"<<endl<<endl;
    s.queries++;
    s.bytes += bytes;
    if (rcode < 0) {
      s.drops++;
    }
    else if (rcode == RCode::NoError) {
      s.noerrors++;
    }
    else if (rcode == RCode::ServFail) {
      s.servfails++;
    }
    else if (rcode == RCode::NXDomain) {
      s.nxdomains++;
    }

    if (remote) {
      s.remotes[*remote]++;
    }

    if (hit) {
      ++s.hits;
    }
  }
  else {
    if (fullname.empty()) {
      size_t needed = name.size() + 1 + domain.size();
      if (fullname.capacity() < needed) {
        fullname.reserve(needed);
      }
      fullname = name;
      fullname.append(".");
      fullname.append(domain);
      labelsCount = count;
    }
    //    cerr<<"Not yet end, set our fullname to '"<<fullname<<"', recursing"<<endl;
    --end;
    children[*end].submit(end, begin, fullname, rcode, bytes, remote, count+1, hit);
  }
}

1	#include "statnode.hh"
2
3	StatNode::Stat StatNode::print(unsigned int depth, Stat newstat, bool silent) const
4	{	×
5	if(!silent) {	×
6	cout<<string(depth, ' ');	×
7	cout<<name<<": "<<endl;	×
8	}	×
9	Stat childstat;	×
10	childstat.queries += s.queries;	×
11	childstat.noerrors += s.noerrors;	×
12	childstat.nxdomains += s.nxdomains;	×
13	childstat.servfails += s.servfails;	×
14	childstat.drops += s.drops;	×
15	childstat.bytes += s.bytes;	×
16	childstat.hits += s.hits;	×
17
18	if(children.size()>1024 && !silent) {	×
19	cout<<string(depth, ' ')<<name<<": too many to print"<<endl;	×
20	}	×
21	for(const children_t::value_type& child : children) {	×
22	childstat=child.second.print(depth+8, childstat, silent \|\| children.size()>1024);	×
23	}	×
24	if(!silent \|\| children.size()>1)	×
25	cout<<string(depth, ' ')<<childstat.queries<<" queries, " <<	×
26	childstat.noerrors<<" noerrors, "<<	×
27	childstat.nxdomains<<" nxdomains, "<<	×
28	childstat.servfails<<" servfails, "<<	×
29	childstat.drops<<" drops, "<<	×
30	childstat.bytes<<" bytes, "<<	×
31	childstat.hits<<" hits"<<endl;	×
32
33	newstat+=childstat;	×
34
35	return newstat;	×
36	}	×
37
38	void StatNode::visit(const visitor_t& visitor, Stat& newstat, unsigned int depth) const
39	{	1,040✔
40	Stat childstat(s);	1,040✔
41
42	for (const auto& child : children) {	1,040✔
43	child.second.visit(visitor, childstat, depth+8);	1,036✔
44	}	1,036✔
45
46	visitor(this, s, childstat);	1,040✔
47
48	newstat += childstat;	1,040✔
49	}	1,040✔
50
51	void StatNode::submit(const DNSName& domain, int rcode, unsigned int bytes, bool hit, const std::optional<ComboAddress>& remote)
52	{	1,024✔
53	// cerr<<"FIRST submit called on '"<<domain<<"'"<<endl;
54	std::vector<string> tmp = domain.getRawLabels();	1,024✔
55	if (tmp.empty()) {	1,024!
56	return;	×
57	}	×
58
59	auto last = tmp.end() - 1;	1,024✔
60	children[*last].submit(last, tmp.begin(), "", rcode, bytes, remote, 1, hit);	1,024✔
61	}	1,024✔
62
63	/* www.powerdns.com. ->
64	. <- fullnames
65	com.
66	powerdns.com
67	www.powerdns.com.
68	*/
69
70	void StatNode::submit(std::vector<string>::const_iterator end, std::vector<string>::const_iterator begin, const std::string& domain, int rcode, unsigned int bytes, const std::optional<ComboAddress>& remote, unsigned int count, bool hit)
71	{	4,096✔
72	// cerr<<"Submit called for domain='"<<domain<<"': ";
73	// for(const std::string& n : labels)
74	// cerr<<n<<".";
75	// cerr<<endl;
76	if (name.empty()) {	4,096✔
77
78	name=*end;	1,036✔
79	// cerr<<"Set short name to '"<<name<<"'"<<endl;
80	}	1,036✔
81	else {	3,060✔
82	// cerr<<"Short name was already set to '"<<name<<"'"<<endl;
83	}	3,060✔
84
85	if (end == begin) {	4,096✔
86	if (fullname.empty()) {	1,024!
87	size_t needed = name.size() + 1 + domain.size();	1,024✔
88	if (fullname.capacity() < needed) {	1,024!
89	fullname.reserve(needed);	1,024✔
90	}	1,024✔
91	fullname = name;	1,024✔
92	fullname.append(".");	1,024✔
93	fullname.append(domain);	1,024✔
94	labelsCount = count;	1,024✔
95	}	1,024✔
96	// cerr<<"Hit the end, set our fullname to '"<<fullname<<"'"<<endl<<endl;
97	s.queries++;	1,024✔
98	s.bytes += bytes;	1,024✔
99	if (rcode < 0) {	1,024!
100	s.drops++;	×
101	}	×
102	else if (rcode == RCode::NoError) {	1,024!
103	s.noerrors++;	1,024✔
104	}	1,024✔
105	else if (rcode == RCode::ServFail) {	×
106	s.servfails++;	×
107	}	×
108	else if (rcode == RCode::NXDomain) {	×
109	s.nxdomains++;	×
110	}	×
111
112	if (remote) {	1,024!
113	s.remotes[*remote]++;	×
114	}	×
115
116	if (hit) {	1,024!
UNCOV 117	++s.hits;	×
UNCOV 118	}	×
119	}	1,024✔
120	else {	3,072✔
121	if (fullname.empty()) {	3,072✔
122	size_t needed = name.size() + 1 + domain.size();	12✔
123	if (fullname.capacity() < needed) {	12✔
124	fullname.reserve(needed);	4✔
125	}	4✔
126	fullname = name;	12✔
127	fullname.append(".");	12✔
128	fullname.append(domain);	12✔
129	labelsCount = count;	12✔
130	}	12✔
131	// cerr<<"Not yet end, set our fullname to '"<<fullname<<"', recursing"<<endl;
132	--end;	3,072✔
133	children[*end].submit(end, begin, fullname, rcode, bytes, remote, count+1, hit);	3,072✔
134	}	3,072✔
135	}	4,096✔

PowerDNS / pdns / 19364671897

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous