Process review comments: rename getname() and move name in RecThreadInfo class

diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index b03c3146082d51deed9cc34a994fd67b0e85f5dc..f94817890563d098dd34c26c588662fec9424c3a 100644 (file)
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -1669,7 +1669,7 @@ static string doGenericTopQueries(pleasequeryfunc_t func, boost::function<DNSNam
 
 static string* nopFunction()
 {
-  return new string("pong " + RecThreadInfo::self().getname() + '\n');
+  return new string("pong " + RecThreadInfo::self().getName() + '\n');
 }
 
 static string getDontThrottleNames()

diff --git a/pdns/recursordist/rec-main.hh b/pdns/recursordist/rec-main.hh
index bfc1283ad26dcce47197ae25ca41fe1a82a60e7c..e4f712238f67c8128851daa184e49f861bf0f413 100644 (file)
--- a/pdns/recursordist/rec-main.hh
+++ b/pdns/recursordist/rec-main.hh
@@ -384,7 +384,7 @@ public:
     t_id = id;
   }
 
-  std::string getname() const
+  std::string getName() const
   {
     return name;
   }
@@ -458,6 +458,7 @@ public:
 private:
   void start(unsigned int id, const string& name, const std::map<unsigned int, std::set<int>>& cpusMap);
 
+  std::string name;
   std::thread thread;
   int exitCode{0};
 
@@ -471,7 +472,6 @@ private:
   bool taskThread{false};
 
   static thread_local unsigned int t_id;
-  std::string name;
   static std::vector<RecThreadInfo> s_threadInfos;
   static bool s_weDistributeQueries; // if true, 1 or more threads listen on the incoming query sockets and distribute them to workers
   static unsigned int s_numDistributorThreads;