From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 27 Sep 2018 11:12:06 +0000 (+0200)
Subject: auth: Name all threads
X-Git-Tag: dnsdist-1.3.3~68^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09b12b5d37de080c217631312a70279050519f24;p=thirdparty%2Fpdns.git

auth: Name all threads
---

diff --git a/pdns/auth-carbon.cc b/pdns/auth-carbon.cc
index 3913763009..f27e6ddb90 100644
--- a/pdns/auth-carbon.cc
+++ b/pdns/auth-carbon.cc
@@ -34,6 +34,11 @@
 void* carbonDumpThread(void*)
 try
 {
+  string threadName = "pdns/carbonDump";
+  auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+  if (retval != 0) {
+    g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for Carbon dump thread: "<<strerror(retval)<<endl;
+  }
   extern StatBag S;
 
   string hostname=arg()["carbon-ourname"];
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 2a05f06901..892cd963d7 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -367,6 +367,12 @@ void sendout(DNSPacket* a)
 void *qthread(void *number)
 try
 {
+  string threadName = "pdns/receiver";
+  auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+  if (retval != 0) {
+    g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for receiver thread: "<<strerror(retval)<<endl;
+  }
+
   DNSPacket *P;
   DNSDistributor *distributor = DNSDistributor::Create(::arg().asNum("distributor-threads", 1)); // the big dispatcher!
   int num = (int)(unsigned long)number;
diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index e521b5d6e2..52f1aafdb8 100644
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -40,6 +40,11 @@
 // there can be MANY OF THESE
 void CommunicatorClass::retrievalLoopThread(void)
 {
+  string threadName = "pdns/comm-retre";
+  auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+  if (retval != 0) {
+    g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for retrieval thread: "<<strerror(retval)<<endl;
+  }
   for(;;) {
     d_suck_sem.wait();
     SuckRequest sr;
@@ -104,6 +109,12 @@ void CommunicatorClass::go()
 void CommunicatorClass::mainloop(void)
 {
   try {
+    string threadName = "pdns/comm-main";
+    auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+    if (retval != 0) {
+      g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for communicator main thread: "<<strerror(retval)<<endl;
+    }
+
     signal(SIGPIPE,SIG_IGN);
     g_log<<Logger::Error<<"Master/slave communicator launching"<<endl;
     PacketHandler P;
diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index 490602f3e9..2abd21684e 100644
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -173,6 +173,11 @@ template<class Answer, class Question, class Backend>MultiThreadDistributor<Answ
 // start of a new thread
 template<class Answer, class Question, class Backend>void *MultiThreadDistributor<Answer,Question,Backend>::makeThread(void *p)
 {
+  string threadName = "pdns/distributo";
+  auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+  if (retval != 0) {
+    g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for distributor thread: "<<strerror(retval)<<endl;
+  }
   pthread_detach(pthread_self());
   MultiThreadDistributor *us=static_cast<MultiThreadDistributor *>(p);
   int ournum=us->d_running++;
diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc
index aed97610b4..18c3d4c4b2 100644
--- a/pdns/dnsproxy.cc
+++ b/pdns/dnsproxy.cc
@@ -175,6 +175,11 @@ int DNSProxy::getID_locked()
 
 void DNSProxy::mainloop(void)
 {
+  string threadName = "pdns/dnsproxy";
+  auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+  if (retval != 0) {
+    g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for DNS proxy thread: "<<strerror(retval)<<endl;
+  }
   try {
     char buffer[1500];
     ssize_t len;
diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 04bf537c10..05036c803b 100644
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -216,6 +216,11 @@ void DynListener::go()
 
 void *DynListener::theListenerHelper(void *p)
 {
+  string threadName = "pdns/ctrlListen";
+  auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+  if (retval != 0) {
+    g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for control socket listener thread: "<<strerror(retval)<<endl;
+  }
   DynListener *us=static_cast<DynListener *>(p);
   us->theListener();
   g_log<<Logger::Error<<"Control listener aborted, please file a bug!"<<endl;
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index b3e14d702b..1307ae75a9 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -252,6 +252,11 @@ void TCPNameserver::decrementClientCount(const ComboAddress& remote)
 
 void *TCPNameserver::doConnection(void *data)
 {
+  string threadName = "pdns/tcpConnect";
+  auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+  if (retval != 0) {
+    g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for TCP nameserver connection thread: "<<strerror(retval)<<endl;
+  }
   shared_ptr<DNSPacket> packet;
   // Fix gcc-4.0 error (on AMD64)
   int fd=(int)(long)data; // gotta love C (generates a harmless warning on opteron)
@@ -1335,6 +1340,11 @@ TCPNameserver::TCPNameserver()
 //! Start of TCP operations thread, we launch a new thread for each incoming TCP question
 void TCPNameserver::thread()
 {
+  string threadName = "pdns/tcpnameser";
+  auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+  if (retval != 0) {
+    g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for TCP nameserver thread: "<<strerror(retval)<<endl;
+  }
   try {
     for(;;) {
       int fd;
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 09d5fa409d..abc16e2fae 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -75,6 +75,11 @@ void AuthWebServer::go()
 void AuthWebServer::statThread()
 {
   try {
+    string threadName = "pdns/statHelper";
+    auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+    if (retval != 0) {
+      g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for stat helper thread: "<<strerror(retval)<<endl;
+    }
     for(;;) {
       d_queries.submit(S.read("udp-queries"));
       d_cachehits.submit(S.read("packetcache-hit"));
@@ -1949,6 +1954,11 @@ void AuthWebServer::cssfunction(HttpRequest* req, HttpResponse* resp)
 void AuthWebServer::webThread()
 {
   try {
+    string threadName = "pdns/webserver";
+    auto retval = pthread_setname_np(pthread_self(), const_cast<char*>(threadName.c_str()));
+    if (retval != 0) {
+      g_log<<Logger::Warning<<"Could not set thread name "<<threadName<<" for webserver thread: "<<strerror(retval)<<endl;
+    }
     if(::arg().mustDo("api")) {
       d_ws->registerApiHandler("/api/v1/servers/localhost/cache/flush", &apiServerCacheFlush);
       d_ws->registerApiHandler("/api/v1/servers/localhost/config", &apiServerConfig);