#include "config.h"
#endif
#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
#include "iputils.hh"
#include "nameserver.hh"
#include "statbag.hh"
#include "auth-querycache.hh"
#include "arguments.hh"
#include <utility>
+#include <thread>
+
extern StatBag S;
BOOST_AUTO_TEST_SUITE(test_packetcache_cc)
vector<DNSZoneRecord> records;
- BOOST_CHECK_EQUAL(QC.size(), 0);
- QC.insert(DNSName("hello"), QType(QType::A), records, 3600, 1);
- BOOST_CHECK_EQUAL(QC.size(), 1);
- BOOST_CHECK_EQUAL(QC.purge(), 1);
- BOOST_CHECK_EQUAL(QC.size(), 0);
+ BOOST_CHECK_EQUAL(QC.size(), 0U);
+ QC.insert(DNSName("hello"), QType(QType::A), vector<DNSZoneRecord>(records), 3600, 1);
+ BOOST_CHECK_EQUAL(QC.size(), 1U);
+ BOOST_CHECK_EQUAL(QC.purge(), 1U);
+ BOOST_CHECK_EQUAL(QC.size(), 0U);
uint64_t counter=0;
try {
DNSName a=DNSName("hello ")+DNSName(std::to_string(counter));
BOOST_CHECK_EQUAL(DNSName(a.toString()), a);
- QC.insert(a, QType(QType::A), records, 3600, 1);
+ QC.insert(a, QType(QType::A), vector<DNSZoneRecord>(records), 3600, 1);
if(!QC.purge(a.toString()))
BOOST_FAIL("Could not remove entry we just added to the query cache!");
- QC.insert(a, QType(QType::A), records, 3600, 1);
+ QC.insert(a, QType(QType::A), vector<DNSZoneRecord>(records), 3600, 1);
}
BOOST_CHECK_EQUAL(QC.size(), counter);
uint64_t delcounter=0;
for(delcounter=0; delcounter < counter/100; ++delcounter) {
DNSName a=DNSName("hello ")+DNSName(std::to_string(delcounter));
- BOOST_CHECK_EQUAL(QC.purge(a.toString()), 1);
+ BOOST_CHECK_EQUAL(QC.purge(a.toString()), 1U);
}
BOOST_CHECK_EQUAL(QC.size(), counter-delcounter);
- uint64_t matches=0;
+ int64_t matches=0;
vector<DNSZoneRecord> entry;
int64_t expected=counter-delcounter;
for(; delcounter < counter; ++delcounter) {
static AuthQueryCache* g_QC;
static AtomicCounter g_QCmissing;
-static void *threadQCMangler(void* a)
+static void threadQCMangler(unsigned int offset)
try
{
vector<DNSZoneRecord> records;
- unsigned int offset=(unsigned int)(unsigned long)a;
for(unsigned int counter=0; counter < 100000; ++counter)
- g_QC->insert(DNSName("hello ")+DNSName(std::to_string(counter+offset)), QType(QType::A), records, 3600, 1);
- return 0;
+ g_QC->insert(DNSName("hello ")+DNSName(std::to_string(counter+offset)), QType(QType::A), vector<DNSZoneRecord>(records), 3600, 1);
}
catch(PDNSException& e) {
cerr<<"Had error: "<<e.reason<<endl;
throw;
}
-static void *threadQCReader(void* a)
+static void threadQCReader(unsigned int offset)
try
{
- unsigned int offset=(unsigned int)(unsigned long)a;
vector<DNSZoneRecord> entry;
for(unsigned int counter=0; counter < 100000; ++counter)
if(!g_QC->getEntry(DNSName("hello ")+DNSName(std::to_string(counter+offset)), QType(QType::A), entry, 1)) {
g_QCmissing++;
}
- return 0;
}
catch(PDNSException& e) {
cerr<<"Had error in threadQCReader: "<<e.reason<<endl;
BOOST_AUTO_TEST_CASE(test_QueryCacheThreaded) {
try {
+ g_QCmissing = 0;
AuthQueryCache QC;
QC.setMaxEntries(1000000);
g_QC=&QC;
- pthread_t tid[4];
- for(int i=0; i < 4; ++i)
- pthread_create(&tid[i], 0, threadQCMangler, (void*)(i*1000000UL));
- void* res;
- for(int i=0; i < 4 ; ++i)
- pthread_join(tid[i], &res);
-
- BOOST_CHECK_EQUAL(QC.size() + S.read("deferred-cache-inserts"), 400000);
+ std::vector<std::thread> manglers;
+ for (int i=0; i < 4; ++i) {
+ manglers.push_back(std::thread(threadQCMangler, i*1000000UL));
+ }
+
+ for (auto& t : manglers) {
+ t.join();
+ }
+ manglers.clear();
+
+ BOOST_CHECK_EQUAL(QC.size() + S.read("deferred-cache-inserts"), 400000U);
BOOST_CHECK_SMALL(1.0*S.read("deferred-cache-inserts"), 10000.0);
- for(int i=0; i < 4; ++i)
- pthread_create(&tid[i], 0, threadQCReader, (void*)(i*1000000UL));
- for(int i=0; i < 4 ; ++i)
- pthread_join(tid[i], &res);
+ std::vector<std::thread> readers;
+ for (int i=0; i < 4; ++i) {
+ readers.push_back(std::thread(threadQCReader, i*1000000UL));
+ }
+
+ for (auto& t : readers) {
+ t.join();
+ }
+ readers.clear();
BOOST_CHECK(S.read("deferred-cache-inserts") + S.read("deferred-cache-lookup") >= g_QCmissing);
// BOOST_CHECK_EQUAL(S.read("deferred-cache-lookup"), 0); // cache cleaning invalidates this
static AuthPacketCache* g_PC;
static AtomicCounter g_PCmissing;
-static void *threadPCMangler(void* a)
+static void threadPCMangler(unsigned int offset)
try
{
- unsigned int offset=(unsigned int)(unsigned long)a;
for(unsigned int counter=0; counter < 100000; ++counter) {
vector<uint8_t> pak;
DNSName qname = DNSName("hello ")+DNSName(std::to_string(counter+offset));
q.setHash(g_PC->canHashPacket(q.getString()));
const unsigned int maxTTL = 3600;
- g_PC->insert(&q, &r, maxTTL);
+ g_PC->insert(q, r, maxTTL);
}
-
- return 0;
}
catch(PDNSException& e) {
cerr<<"Had error: "<<e.reason<<endl;
throw;
}
-static void *threadPCReader(void* a)
+static void threadPCReader(unsigned int offset)
try
{
- unsigned int offset=(unsigned int)(unsigned long)a;
vector<DNSZoneRecord> entry;
for(unsigned int counter=0; counter < 100000; ++counter) {
vector<uint8_t> pak;
q.parse((char*)&pak[0], pak.size());
DNSPacket r(false);
- if(!g_PC->get(&q, &r)) {
+ if(!g_PC->get(q, r)) {
g_PCmissing++;
}
}
-
- return 0;
}
catch(PDNSException& e) {
cerr<<"Had error in threadPCReader: "<<e.reason<<endl;
PC.setTTL(3600);
g_PC=&PC;
- pthread_t tid[4];
- for(int i=0; i < 4; ++i)
- pthread_create(&tid[i], 0, threadPCMangler, (void*)(i*1000000UL));
- void* res;
- for(int i=0; i < 4 ; ++i)
- pthread_join(tid[i], &res);
-
- BOOST_CHECK_EQUAL(PC.size() + S.read("deferred-packetcache-inserts"), 400000);
- BOOST_CHECK_EQUAL(S.read("deferred-packetcache-lookup"), 0);
+ g_PCmissing = 0;
+ std::vector<std::thread> manglers;
+ for (int i=0; i < 4; ++i) {
+ manglers.push_back(std::thread(threadPCMangler, i*1000000UL));
+ }
+
+ for (auto& t : manglers) {
+ t.join();
+ }
+ manglers.clear();
+
+ BOOST_CHECK_EQUAL(PC.size() + S.read("deferred-packetcache-inserts"), 400000UL);
+ BOOST_CHECK_EQUAL(S.read("deferred-packetcache-lookup"), 0UL);
BOOST_CHECK_SMALL(1.0*S.read("deferred-packetcache-inserts"), 10000.0);
- for(int i=0; i < 4; ++i)
- pthread_create(&tid[i], 0, threadPCReader, (void*)(i*1000000UL));
- for(int i=0; i < 4 ; ++i)
- pthread_join(tid[i], &res);
+ std::vector<std::thread> readers;
+ for (int i=0; i < 4; ++i) {
+ readers.push_back(std::thread(threadPCReader, i*1000000UL));
+ }
+
+ for (auto& t : readers) {
+ t.join();
+ }
+ readers.clear();
/*
cerr<<"Misses: "<<S.read("packetcache-miss")<<endl;
cerr<<PC.size()<<endl;
*/
- BOOST_CHECK_EQUAL(g_PCmissing + S.read("packetcache-hit"), 400000);
+ BOOST_CHECK_EQUAL(g_PCmissing + S.read("packetcache-hit"), 400000UL);
BOOST_CHECK_EQUAL(S.read("deferred-packetcache-inserts") + S.read("deferred-packetcache-lookup"), g_PCmissing);
}
catch(PDNSException& e) {
}
bool g_stopCleaning;
-static void *cacheCleaner(void*)
+static void cacheCleaner()
try
{
while(!g_stopCleaning) {
g_QC->cleanup();
}
-
- return 0;
}
catch(PDNSException& e) {
cerr<<"Had error in cacheCleaner: "<<e.reason<<endl;
vector<DNSZoneRecord> records;
for(unsigned int counter = 0; counter < 1000000; ++counter) {
- QC.insert(DNSName("hello ")+DNSName(std::to_string(counter)), QType(QType::A), records, 1, 1);
+ QC.insert(DNSName("hello ")+DNSName(std::to_string(counter)), QType(QType::A), vector<DNSZoneRecord>(records), 1, 1);
}
sleep(1);
g_QC=&QC;
- pthread_t tid[4];
+ std::vector<std::thread> readers;
+ for (int i=0; i < 4; ++i) {
+ if (i < 3) {
+ readers.push_back(std::thread(threadQCReader, i*1000000UL));
+ }
+ else {
+ readers.push_back(std::thread(cacheCleaner));
+ }
+ }
- pthread_create(&tid[0], 0, threadQCReader, (void*)(0*1000000UL));
- pthread_create(&tid[1], 0, threadQCReader, (void*)(1*1000000UL));
- pthread_create(&tid[2], 0, threadQCReader, (void*)(2*1000000UL));
- // pthread_create(&tid[2], 0, threadMangler, (void*)(0*1000000UL));
- pthread_create(&tid[3], 0, cacheCleaner, 0);
+ for (int i = 0; i < 3 ; ++i) {
+ readers.at(i).join();
+ }
- void *res;
- for(int i=0; i < 3 ; ++i)
- pthread_join(tid[i], &res);
g_stopCleaning=true;
- pthread_join(tid[3], &res);
+ readers.at(3).join();
+
+ readers.clear();
}
catch(PDNSException& e) {
cerr<<"Had error in test_QueryCacheClean: "<<e.reason<<endl;
}
/* this call is required so the correct hash is set into q->d_hash */
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), false);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), false);
- PC.insert(&q, &r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ PC.insert(q, r, 3600);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), true);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
/* different QID, still should match */
- BOOST_CHECK_EQUAL(PC.get(&differentIDQ, &r2), true);
+ BOOST_CHECK_EQUAL(PC.get(differentIDQ, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
/* with EDNS, should not match */
- BOOST_CHECK_EQUAL(PC.get(&ednsQ, &r2), false);
+ BOOST_CHECK_EQUAL(PC.get(ednsQ, r2), false);
/* inserting the EDNS-enabled one too */
- PC.insert(&ednsQ, &r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 2);
+ PC.insert(ednsQ, r, 3600);
+ BOOST_CHECK_EQUAL(PC.size(), 2U);
/* different EDNS versions, should not match */
- BOOST_CHECK_EQUAL(PC.get(&ednsVersion42, &r2), false);
+ BOOST_CHECK_EQUAL(PC.get(ednsVersion42, r2), false);
/* EDNS DO set, should not match */
- BOOST_CHECK_EQUAL(PC.get(&ednsDO, &r2), false);
+ BOOST_CHECK_EQUAL(PC.get(ednsDO, r2), false);
/* EDNS Client Subnet set, should not match
since not only we don't skip the actual option, but the
total EDNS opt RR is still different. */
- BOOST_CHECK_EQUAL(PC.get(&ecs1, &r2), false);
+ BOOST_CHECK_EQUAL(PC.get(ecs1, r2), false);
/* inserting the version with ECS Client Subnet set,
it should NOT replace the existing EDNS one. */
- PC.insert(&ecs1, &r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 3);
+ PC.insert(ecs1, r, 3600);
+ BOOST_CHECK_EQUAL(PC.size(), 3U);
/* different subnet of same size, should NOT match
since we don't skip the option */
- BOOST_CHECK_EQUAL(PC.get(&ecs2, &r2), false);
+ BOOST_CHECK_EQUAL(PC.get(ecs2, r2), false);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
/* different subnet of different size, should NOT match. */
- BOOST_CHECK_EQUAL(PC.get(&ecs3, &r2), false);
+ BOOST_CHECK_EQUAL(PC.get(ecs3, r2), false);
- BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com"), 3);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), false);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com"), 3U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), false);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
- PC.insert(&q, &r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), true);
+ PC.insert(q, r, 3600);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.purge("com$"), 1);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), false);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.purge("com$"), 1U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), false);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
- PC.insert(&q, &r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), true);
+ PC.insert(q, r, 3600);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.purge("powerdns.com$"), 1);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), false);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.purge("powerdns.com$"), 1U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), false);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
- PC.insert(&q, &r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), true);
+ PC.insert(q, r, 3600);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com$"), 1);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), false);
- BOOST_CHECK_EQUAL(PC.size(), 0);
-
- PC.insert(&q, &r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
- BOOST_CHECK_EQUAL(PC.purge("www.powerdns.net"), 0);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), true);
+ BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com$"), 1U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), false);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
+
+ PC.insert(q, r, 3600);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
+ BOOST_CHECK_EQUAL(PC.purge("www.powerdns.net"), 0U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
- BOOST_CHECK_EQUAL(PC.purge("net$"), 0);
- BOOST_CHECK_EQUAL(PC.get(&q, &r2), true);
+ BOOST_CHECK_EQUAL(PC.purge("net$"), 0U);
+ BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
- BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com$"), 1);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com$"), 1U);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
}
catch(PDNSException& e) {
cerr<<"Had error in AuthPacketCache: "<<e.reason<<endl;