github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

shift lmdb initialization to provider constructor which is called only once

Browse Source
This commit is contained in:
tomasz.ziolkowski 2022-04-29 06:49:00 +02:00
parent 00483e4009
commit 82326ffe2b
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/collection/backend/lmdb.cc
View File

@ -501,43 +501,27 @@ end_txn:
} }
MDBEnvProvider::MDBEnvProvider() : MDBEnvProvider::MDBEnvProvider() : m_env(NULL) {
m_env(NULL), initialized(false) { MDB_txn *txn;
pthread_mutex_init(&m_lock, NULL); mdb_env_create(&m_env);
mdb_env_open(m_env, "./modsec-shared-collections",
MDB_WRITEMAP | MDB_NOSUBDIR, 0664);
mdb_txn_begin(m_env, NULL, 0, &txn);
mdb_dbi_open(txn, NULL, MDB_CREATE | MDB_DUPSORT, &m_dbi);
mdb_txn_commit(txn);
} }
MDB_env* MDBEnvProvider::GetEnv() { MDB_env* MDBEnvProvider::GetEnv() {
init();
return m_env; return m_env;
} }
MDB_dbi* MDBEnvProvider::GetDBI() { MDB_dbi* MDBEnvProvider::GetDBI() {
init();
return &m_dbi; return &m_dbi;
} }
void MDBEnvProvider::init() { MDBEnvProvider::~MDBEnvProvider() {
pthread_mutex_lock(&m_lock); mdb_dbi_close(m_env, m_dbi);
if (!initialized) { mdb_env_close(m_env);
MDB_txn *txn;
initialized = true;
mdb_env_create(&m_env);
mdb_env_open(m_env, "./modsec-shared-collections",
MDB_WRITEMAP | MDB_NOSUBDIR, 0664);
mdb_txn_begin(m_env, NULL, 0, &txn);
mdb_dbi_open(txn, NULL, MDB_CREATE | MDB_DUPSORT, &m_dbi);
mdb_txn_commit(txn);
}
pthread_mutex_unlock(&m_lock);
}
void MDBEnvProvider::close() {
pthread_mutex_lock(&m_lock);
if (initialized) {
mdb_dbi_close(m_env, m_dbi);
mdb_env_close(m_env);
}
pthread_mutex_unlock(&m_lock);
} }
#endif #endif

6
src/collection/backend/lmdb.h
View File

@ -83,16 +83,12 @@ class MDBEnvProvider {
} }
MDB_env* GetEnv(); MDB_env* GetEnv();
MDB_dbi* GetDBI(); MDB_dbi* GetDBI();
~MDBEnvProvider();
private: private:
MDB_env *m_env; MDB_env *m_env;
MDB_dbi m_dbi; MDB_dbi m_dbi;
pthread_mutex_t m_lock;
MDBEnvProvider(); MDBEnvProvider();
bool initialized;
void init();
void close();
}; };
class LMDB : class LMDB :