From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 28 Apr 2020 13:59:46 +0000 (+0200)
Subject: Lock: Remove the unused g_singleThreaded variable
X-Git-Tag: dnsdist-1.5.0-rc2~7^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8466f9e194f62a282ac42e9e5ac7505b033a6939;p=thirdparty%2Fpdns.git

Lock: Remove the unused g_singleThreaded variable
---

diff --git a/pdns/lock.hh b/pdns/lock.hh
index 7bd6112846..e3a1e1b57a 100644
--- a/pdns/lock.hh
+++ b/pdns/lock.hh
@@ -25,8 +25,6 @@
 #include "misc.hh"
 #include "pdnsexception.hh"
 
-extern bool g_singleThreaded;
-
 class ReadWriteLock
 {
 public:
@@ -61,9 +59,6 @@ public:
 
   WriteLock(pthread_rwlock_t *lock) : d_lock(lock)
   {
-    if(g_singleThreaded)
-      return;
-
     int err;
     if((err = pthread_rwlock_wrlock(d_lock))) {
       throw PDNSException("error acquiring rwlock wrlock: "+stringerror(err));
@@ -71,8 +66,6 @@ public:
   }
   ~WriteLock()
   {
-    if(g_singleThreaded)
-      return;
     if(d_lock) // might have been moved
       pthread_rwlock_unlock(d_lock);
   }
@@ -105,11 +98,6 @@ public:
 
   TryWriteLock(pthread_rwlock_t *lock) : d_lock(lock)
   {
-    if(g_singleThreaded) {
-      d_havelock=true;
-      return;
-    }
-
     d_havelock=false;
     int err;
     if((err = pthread_rwlock_trywrlock(d_lock)) && err!=EBUSY) {
@@ -136,17 +124,11 @@ public:
 
   ~TryWriteLock()
   {
-    if(g_singleThreaded)
-      return;
-
     if(d_havelock && d_lock) // we might be moved
       pthread_rwlock_unlock(d_lock);
   }
   bool gotIt()
   {
-    if(g_singleThreaded)
-      return true;
-
     return d_havelock;
   }
 };
@@ -161,11 +143,6 @@ public:
 
   TryReadLock(pthread_rwlock_t *lock) : d_lock(lock)
   {
-    if(g_singleThreaded) {
-      d_havelock=true;
-      return;
-    }
-
     int err;
     if((err = pthread_rwlock_tryrdlock(d_lock)) && err!=EBUSY) {
       throw PDNSException("error acquiring rwlock tryrdlock: "+stringerror(err));
@@ -191,17 +168,11 @@ public:
 
   ~TryReadLock()
   {
-    if(g_singleThreaded)
-      return;
-
     if(d_havelock && d_lock)
       pthread_rwlock_unlock(d_lock);
   }
   bool gotIt()
   {
-    if(g_singleThreaded)
-      return true;
-
     return d_havelock;
   }
 };
@@ -214,9 +185,6 @@ public:
 
   ReadLock(pthread_rwlock_t *lock) : d_lock(lock)
   {
-    if(g_singleThreaded)
-      return;
-
     int err;
     if((err = pthread_rwlock_rdlock(d_lock))) {
       throw PDNSException("error acquiring rwlock readlock: "+stringerror(err));
@@ -233,8 +201,6 @@ public:
 
   ~ReadLock()
   {
-    if(g_singleThreaded)
-      return;
     if(d_lock) // may have been moved
       pthread_rwlock_unlock(d_lock);
   }
diff --git a/pdns/misc.cc b/pdns/misc.cc
index a9839a2292..fb253e5f1c 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -65,8 +65,6 @@
 #  include <sched.h>
 #endif
 
-bool g_singleThreaded;
-
 size_t writen2(int fd, const void *buf, size_t count)
 {
   const char *ptr = (char*)buf;