upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the DLV statistics counter

Browse source 
This also removes counting the DLV RRtype separately.  Since we have
deprecated the lookaside validation it makes no sense to keep this
special statistic counter.
This commit is contained in:
Matthijs Mekking 2020-01-17 08:35:12 +01:00 committed by Matthijs Mekking
parent 59a1e5564d
commit 3079956ff7
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/dns/stats.c
View file

@ -53,9 +53,8 @@ typedef enum {
*/
enum {
/* For 0-255, we use the rdtype value as counter indices */
rdtypecounter_dlv = 256, /* for dns_rdatatype_dlv */
rdtypecounter_others = 257, /* anything else */
rdtypecounter_max = 258,
rdtypecounter_others = 256, /* anything else */
rdtypecounter_max = 257,
/* The following are used for nxrrset rdataset */
rdtypenxcounter_max = rdtypecounter_max * 2,
/* nxdomain counter */
@ -226,9 +225,7 @@ dns_rdatatypestats_increment(dns_stats_t *stats, dns_rdatatype_t type) {
REQUIRE(DNS_STATS_VALID(stats) && stats->type == dns_statstype_rdtype);
if (type == dns_rdatatype_dlv)
counter = rdtypecounter_dlv;
else if (type > dns_rdatatype_any)
if (type > dns_rdatatype_any)
counter = rdtypecounter_others;
else
counter = (int)type;
@ -248,9 +245,7 @@ update_rdatasetstats(dns_stats_t *stats, dns_rdatastatstype_t rrsettype,
counter = rdtypecounter_nxdomain;
} else {
rdtype = DNS_RDATASTATSTYPE_BASE(rrsettype);
if (rdtype == dns_rdatatype_dlv)
counter = (int)rdtypecounter_dlv;
else if (rdtype > dns_rdatatype_any)
if (rdtype > dns_rdatatype_any)
counter = (int)rdtypecounter_others;
else
counter = (int)rdtype;
@ -338,10 +333,7 @@ dump_rdentry(int rdcounter, uint64_t value, dns_rdatastatstype_t attributes,
if (rdcounter == rdtypecounter_others)
attributes |= DNS_RDATASTATSTYPE_ATTR_OTHERTYPE;
else {
if (rdcounter == rdtypecounter_dlv)
rdtype = dns_rdatatype_dlv;
else
rdtype = (dns_rdatatype_t)rdcounter;
rdtype = (dns_rdatatype_t)rdcounter;
}
type = DNS_RDATASTATSTYPE_VALUE((dns_rdatastatstype_t)rdtype,
attributes);

5
lib/dns/tests/rdatasetstats_test.c
View file

@ -228,7 +228,6 @@ rdatasetstats(void **state, bool servestale) {
set_typestats(stats, (dns_rdatatype_t)i);
}
/* Specials */
set_typestats(stats, dns_rdatatype_dlv);
set_typestats(stats, (dns_rdatatype_t)1000);
set_nxdomainstats(stats);
@ -241,8 +240,6 @@ rdatasetstats(void **state, bool servestale) {
mark_stale(stats, (dns_rdatatype_t)i, 0,
DNS_RDATASTATSTYPE_ATTR_STALE);
}
mark_stale(stats, dns_rdatatype_dlv, 0,
DNS_RDATASTATSTYPE_ATTR_STALE);
mark_stale(stats, (dns_rdatatype_t)1000, 0,
DNS_RDATASTATSTYPE_ATTR_STALE);
mark_nxdomain_stale(stats, 0, DNS_RDATASTATSTYPE_ATTR_STALE);
@ -259,8 +256,6 @@ rdatasetstats(void **state, bool servestale) {
mark_stale(stats, (dns_rdatatype_t)i, from,
DNS_RDATASTATSTYPE_ATTR_ANCIENT);
}
mark_stale(stats, dns_rdatatype_dlv, from,
DNS_RDATASTATSTYPE_ATTR_ANCIENT);
mark_stale(stats, (dns_rdatatype_t)1000, from,
DNS_RDATASTATSTYPE_ATTR_ANCIENT);
mark_nxdomain_stale(stats, from, DNS_RDATASTATSTYPE_ATTR_ANCIENT);