twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Encapsulate BDB environment inside new CDBEnv class 

Cleans up and organizes several scattered functions and variables related to
the BDB env.  Class CDBInit() existed to provide a
guaranteed-via-C++-destructor cleanup of the db environment.

A formal CDBEnv class provides all of this inside a single wrapper.
miguelfreitas
Jeff Garzik 13 years ago committed by Jeff Garzik
parent
b52a270538
commit
cd9696fc97
4 changed files with 110 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      src/db.cpp
  2. 30
      src/db.h
  3. 6
      src/init.cpp
  4. 11
      src/walletdb.cpp

103
src/db.cpp
Unescape View File

@ -26,14 +26,11 @@ unsigned int nWalletDBUpdated;
// CDB // CDB
// //
CCriticalSection cs_db; CDBEnv bitdb;
static bool fDbEnvInit = false;
bool fDetachDB = false;
DbEnv dbenv(0);
map<string, int> mapFileUseCount; map<string, int> mapFileUseCount;
static map<string, Db*> mapDb; static map<string, Db*> mapDb;
static void EnvShutdown() void CDBEnv::EnvShutdown()
{ {
if (!fDbEnvInit) if (!fDbEnvInit)
return; return;
@ -50,39 +47,30 @@ static void EnvShutdown()
DbEnv(0).remove(GetDataDir().string().c_str(), 0); DbEnv(0).remove(GetDataDir().string().c_str(), 0);
} }
class CDBInit CDBEnv::CDBEnv() : dbenv(0)
{
public:
CDBInit()
{ {
} }
~CDBInit()
CDBEnv::~CDBEnv()
{ {
EnvShutdown(); EnvShutdown();
} }
}
instance_of_cdbinit;
CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL) void CDBEnv::Close()
{ {
int ret; EnvShutdown();
if (pszFile == NULL) }
return;
fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
bool fCreate = strchr(pszMode, 'c');
unsigned int nFlags = DB_THREAD;
if (fCreate)
nFlags |= DB_CREATE;
bool CDBEnv::Open(boost::filesystem::path pathEnv_)
{ {
LOCK(cs_db); if (fDbEnvInit)
if (!fDbEnvInit) return true;
{
if (fShutdown) if (fShutdown)
return; return false;
filesystem::path pathDataDir = GetDataDir();
pathEnv = pathEnv_;
filesystem::path pathDataDir = pathEnv;
filesystem::path pathLogDir = pathDataDir / "database"; filesystem::path pathLogDir = pathDataDir / "database";
filesystem::create_directory(pathLogDir); filesystem::create_directory(pathLogDir);
filesystem::path pathErrorFile = pathDataDir / "db.log"; filesystem::path pathErrorFile = pathDataDir / "db.log";
@ -96,10 +84,10 @@ CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL)
dbenv.set_lk_max_locks(10000); dbenv.set_lk_max_locks(10000);
dbenv.set_lk_max_objects(10000); dbenv.set_lk_max_objects(10000);
dbenv.set_errfile(fopen(pathErrorFile.string().c_str(), "a")); /// debug dbenv.set_errfile(fopen(pathErrorFile.string().c_str(), "a")); /// debug
dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1);
dbenv.set_flags(DB_AUTO_COMMIT, 1); dbenv.set_flags(DB_AUTO_COMMIT, 1);
dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1);
dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1); dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1);
ret = dbenv.open(pathDataDir.string().c_str(), int ret = dbenv.open(pathDataDir.string().c_str(),
DB_CREATE | DB_CREATE |
DB_INIT_LOCK | DB_INIT_LOCK |
DB_INIT_LOG | DB_INIT_LOG |
@ -109,16 +97,42 @@ CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL)
DB_RECOVER, DB_RECOVER,
S_IRUSR | S_IWUSR); S_IRUSR | S_IWUSR);
if (ret > 0) if (ret > 0)
throw runtime_error(strprintf("CDB() : error %d opening database environment", ret)); return error("CDB() : error %d opening database environment", ret);
fDbEnvInit = true; fDbEnvInit = true;
return true;
} }
void CDBEnv::CheckpointLSN(std::string strFile)
{
dbenv.txn_checkpoint(0, 0, 0);
dbenv.lsn_reset(strFile.c_str(), 0);
}
CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL)
{
int ret;
if (pszFile == NULL)
return;
fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
bool fCreate = strchr(pszMode, 'c');
unsigned int nFlags = DB_THREAD;
if (fCreate)
nFlags |= DB_CREATE;
{
LOCK(bitdb.cs_db);
if (!bitdb.Open(GetDataDir()))
throw runtime_error("env open failed");
strFile = pszFile; strFile = pszFile;
++mapFileUseCount[strFile]; ++mapFileUseCount[strFile];
pdb = mapDb[strFile]; pdb = mapDb[strFile];
if (pdb == NULL) if (pdb == NULL)
{ {
pdb = new Db(&dbenv, 0); pdb = new Db(&bitdb.dbenv, 0);
ret = pdb->open(NULL, // Txn pointer ret = pdb->open(NULL, // Txn pointer
pszFile, // Filename pszFile, // Filename
@ -132,7 +146,7 @@ CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL)
delete pdb; delete pdb;
pdb = NULL; pdb = NULL;
{ {
LOCK(cs_db); LOCK(bitdb.cs_db);
--mapFileUseCount[strFile]; --mapFileUseCount[strFile];
} }
strFile = ""; strFile = "";
@ -170,10 +184,10 @@ void CDB::Close()
if (strFile == "blkindex.dat" && IsInitialBlockDownload()) if (strFile == "blkindex.dat" && IsInitialBlockDownload())
nMinutes = 5; nMinutes = 5;
dbenv.txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100)*1024 : 0, nMinutes, 0); bitdb.dbenv.txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100)*1024 : 0, nMinutes, 0);
{ {
LOCK(cs_db); LOCK(bitdb.cs_db);
--mapFileUseCount[strFile]; --mapFileUseCount[strFile];
} }
} }
@ -181,7 +195,7 @@ void CDB::Close()
void CloseDb(const string& strFile) void CloseDb(const string& strFile)
{ {
{ {
LOCK(cs_db); LOCK(bitdb.cs_db);
if (mapDb[strFile] != NULL) if (mapDb[strFile] != NULL)
{ {
// Close the database handle // Close the database handle
@ -198,13 +212,12 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
while (!fShutdown) while (!fShutdown)
{ {
{ {
LOCK(cs_db); LOCK(bitdb.cs_db);
if (!mapFileUseCount.count(strFile) || mapFileUseCount[strFile] == 0) if (!mapFileUseCount.count(strFile) || mapFileUseCount[strFile] == 0)
{ {
// Flush log data to the dat file // Flush log data to the dat file
CloseDb(strFile); CloseDb(strFile);
dbenv.txn_checkpoint(0, 0, 0); bitdb.CheckpointLSN(strFile);
dbenv.lsn_reset(strFile.c_str(), 0);
mapFileUseCount.erase(strFile); mapFileUseCount.erase(strFile);
bool fSuccess = true; bool fSuccess = true;
@ -212,7 +225,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
string strFileRes = strFile + ".rewrite"; string strFileRes = strFile + ".rewrite";
{ // surround usage of db with extra {} { // surround usage of db with extra {}
CDB db(strFile.c_str(), "r"); CDB db(strFile.c_str(), "r");
Db* pdbCopy = new Db(&dbenv, 0); Db* pdbCopy = new Db(&bitdb.dbenv, 0);
int ret = pdbCopy->open(NULL, // Txn pointer int ret = pdbCopy->open(NULL, // Txn pointer
strFileRes.c_str(), // Filename strFileRes.c_str(), // Filename
@ -270,10 +283,10 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
} }
if (fSuccess) if (fSuccess)
{ {
Db dbA(&dbenv, 0); Db dbA(&bitdb.dbenv, 0);
if (dbA.remove(strFile.c_str(), NULL, 0)) if (dbA.remove(strFile.c_str(), NULL, 0))
fSuccess = false; fSuccess = false;
Db dbB(&dbenv, 0); Db dbB(&bitdb.dbenv, 0);
if (dbB.rename(strFileRes.c_str(), NULL, strFile.c_str(), 0)) if (dbB.rename(strFileRes.c_str(), NULL, strFile.c_str(), 0))
fSuccess = false; fSuccess = false;
} }
@ -288,12 +301,12 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
} }
void DBFlush(bool fShutdown) void CDBEnv::Flush(bool fShutdown)
{ {
int64 nStart = GetTimeMillis(); int64 nStart = GetTimeMillis();
// Flush log data to the actual data file // Flush log data to the actual data file
// on all files that are not in use // on all files that are not in use
printf("DBFlush(%s)%s\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started"); printf("Flush(%s)%s\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started");
if (!fDbEnvInit) if (!fDbEnvInit)
return; return;
{ {
@ -327,7 +340,7 @@ void DBFlush(bool fShutdown)
if (mapFileUseCount.empty()) if (mapFileUseCount.empty())
{ {
dbenv.log_archive(&listp, DB_ARCH_REMOVE); dbenv.log_archive(&listp, DB_ARCH_REMOVE);
EnvShutdown(); Close();
} }
} }
} }

30
src/db.h
Unescape View File

@ -25,14 +25,36 @@ class CWallet;
class CWalletTx; class CWalletTx;
extern unsigned int nWalletDBUpdated; extern unsigned int nWalletDBUpdated;
extern bool fDetachDB;
extern DbEnv dbenv;
extern void DBFlush(bool fShutdown);
void ThreadFlushWalletDB(void* parg); void ThreadFlushWalletDB(void* parg);
bool BackupWallet(const CWallet& wallet, const std::string& strDest); bool BackupWallet(const CWallet& wallet, const std::string& strDest);
class CDBEnv
{
private:
bool fDetachDB;
bool fDbEnvInit;
boost::filesystem::path pathEnv;
void EnvShutdown();
public:
mutable CCriticalSection cs_db;
DbEnv dbenv;
CDBEnv();
~CDBEnv();
bool Open(boost::filesystem::path pathEnv_);
void Close();
void Flush(bool fShutdown);
void CheckpointLSN(std::string strFile);
void SetDetach(bool fDetachDB_) { fDetachDB = fDetachDB_; }
};
extern CDBEnv bitdb;
/** RAII class that provides access to a Berkeley database */ /** RAII class that provides access to a Berkeley database */
class CDB class CDB
{ {
@ -216,7 +238,7 @@ public:
if (!pdb) if (!pdb)
return false; return false;
DbTxn* ptxn = NULL; DbTxn* ptxn = NULL;
int ret = dbenv.txn_begin(GetTxn(), &ptxn, DB_TXN_WRITE_NOSYNC); int ret = bitdb.dbenv.txn_begin(GetTxn(), &ptxn, DB_TXN_WRITE_NOSYNC);
if (!ptxn || ret != 0) if (!ptxn || ret != 0)
return false; return false;
vTxn.push_back(ptxn); vTxn.push_back(ptxn);

6
src/init.cpp
Unescape View File

@ -54,9 +54,9 @@ void Shutdown(void* parg)
{ {
fShutdown = true; fShutdown = true;
nTransactionsUpdated++; nTransactionsUpdated++;
DBFlush(false); bitdb.Flush(false);
StopNode(); StopNode();
DBFlush(true); bitdb.Flush(true);
boost::filesystem::remove(GetPidFile()); boost::filesystem::remove(GetPidFile());
UnregisterWallet(pwalletMain); UnregisterWallet(pwalletMain);
delete pwalletMain; delete pwalletMain;
@ -294,7 +294,7 @@ bool AppInit2()
} }
fDebug = GetBoolArg("-debug"); fDebug = GetBoolArg("-debug");
fDetachDB = GetBoolArg("-detachdb", false); bitdb.SetDetach(GetBoolArg("-detachdb", false));
#if !defined(WIN32) && !defined(QT_GUI) #if !defined(WIN32) && !defined(QT_GUI)
fDaemon = GetBoolArg("-daemon"); fDaemon = GetBoolArg("-daemon");

11
src/walletdb.cpp
Unescape View File

@ -13,7 +13,6 @@ using namespace boost;
static uint64 nAccountingEntryNumber = 0; static uint64 nAccountingEntryNumber = 0;
extern CCriticalSection cs_db;
extern map<string, int> mapFileUseCount; extern map<string, int> mapFileUseCount;
extern void CloseDb(const string& strFile); extern void CloseDb(const string& strFile);
@ -350,7 +349,7 @@ void ThreadFlushWalletDB(void* parg)
if (nLastFlushed != nWalletDBUpdated && GetTime() - nLastWalletUpdate >= 2) if (nLastFlushed != nWalletDBUpdated && GetTime() - nLastWalletUpdate >= 2)
{ {
TRY_LOCK(cs_db,lockDb); TRY_LOCK(bitdb.cs_db,lockDb);
if (lockDb) if (lockDb)
{ {
// Don't do this if any databases are in use // Don't do this if any databases are in use
@ -373,8 +372,7 @@ void ThreadFlushWalletDB(void* parg)
// Flush wallet.dat so it's self contained // Flush wallet.dat so it's self contained
CloseDb(strFile); CloseDb(strFile);
dbenv.txn_checkpoint(0, 0, 0); bitdb.CheckpointLSN(strFile);
dbenv.lsn_reset(strFile.c_str(), 0);
mapFileUseCount.erase(mi++); mapFileUseCount.erase(mi++);
printf("Flushed wallet.dat %"PRI64d"ms\n", GetTimeMillis() - nStart); printf("Flushed wallet.dat %"PRI64d"ms\n", GetTimeMillis() - nStart);
@ -392,13 +390,12 @@ bool BackupWallet(const CWallet& wallet, const string& strDest)
while (!fShutdown) while (!fShutdown)
{ {
{ {
LOCK(cs_db); LOCK(bitdb.cs_db);
if (!mapFileUseCount.count(wallet.strWalletFile) || mapFileUseCount[wallet.strWalletFile] == 0) if (!mapFileUseCount.count(wallet.strWalletFile) || mapFileUseCount[wallet.strWalletFile] == 0)
{ {
// Flush log data to the dat file // Flush log data to the dat file
CloseDb(wallet.strWalletFile); CloseDb(wallet.strWalletFile);
dbenv.txn_checkpoint(0, 0, 0); bitdb.CheckpointLSN(wallet.strWalletFile);
dbenv.lsn_reset(wallet.strWalletFile.c_str(), 0);
mapFileUseCount.erase(wallet.strWalletFile); mapFileUseCount.erase(wallet.strWalletFile);
// Copy wallet.dat // Copy wallet.dat

Write Preview
Loading…
Cancel
Save