From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sat, 13 Sep 2014 10:37:01 +0000 (+0200)
Subject: add initlock in lmdb backend
X-Git-Tag: auth-3.4.0-rc2~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1711%2Fhead;p=thirdparty%2Fpdns.git

add initlock in lmdb backend
---

diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 080d747dcc..fe302aab2b 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -22,6 +22,7 @@
 #include "lmdbbackend.hh"
 #include <pdns/arguments.hh>
 #include <pdns/base32.hh>
+#include <pdns/lock.hh>
 
 #if 0
 #define DEBUGLOG(msg) L<<Logger::Error<<msg
@@ -29,6 +30,8 @@
 #define DEBUGLOG(msg) do {} while(0)
 #endif
 
+pthread_mutex_t LMDBBackend::s_initlock = PTHREAD_MUTEX_INITIALIZER;
+
 LMDBBackend::LMDBBackend(const string &suffix)
 {
     setArgPrefix("lmdb"+suffix);
@@ -52,6 +55,8 @@ void LMDBBackend::open_db() {
     if( MDB_VERINT( major, minor, patch ) < MDB_VERINT( 0, 9, 8 ) )
         throw PDNSException( "LMDB Library version too old (" + verstring + "). Needs to be 0.9.8 or greater" );
 
+    Lock l(&s_initlock);
+
     if( (rc = mdb_env_create(&env))  )
         throw PDNSException("Couldn't open LMDB database " + path + ": mdb_env_create() returned " + mdb_strerror(rc));
 
diff --git a/modules/lmdbbackend/lmdbbackend.hh b/modules/lmdbbackend/lmdbbackend.hh
index 52367717e6..aeaa2765a5 100644
--- a/modules/lmdbbackend/lmdbbackend.hh
+++ b/modules/lmdbbackend/lmdbbackend.hh
@@ -4,6 +4,7 @@
  */
 
 #include <lmdb.h>
+#include <pthread.h>
 #include <pdns/dnsbackend.hh>
 
 class LMDBBackend : public DNSReversedBackend
@@ -39,6 +40,7 @@ private:
     void open_db();
     void close_db();
     inline bool get_finished();
+    static pthread_mutex_t s_initlock;
 
 public:
     LMDBBackend(const string &suffix="");