aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/db.cpp182
-rw-r--r--src/db.h84
-rw-r--r--src/init.cpp6
-rw-r--r--src/main.cpp1
-rw-r--r--src/walletdb.cpp32
5 files changed, 166 insertions, 139 deletions
diff --git a/src/db.cpp b/src/db.cpp
index 5c169fe0ca..95220059d0 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -26,14 +26,9 @@ unsigned int nWalletDBUpdated;
// CDB
//
-CCriticalSection cs_db;
-static bool fDbEnvInit = false;
-bool fDetachDB = false;
-DbEnv dbenv(0);
-map<string, int> mapFileUseCount;
-static map<string, Db*> mapDb;
-
-static void EnvShutdown()
+CDBEnv bitdb;
+
+void CDBEnv::EnvShutdown()
{
if (!fDbEnvInit)
return;
@@ -50,21 +45,76 @@ static void EnvShutdown()
DbEnv(0).remove(GetDataDir().string().c_str(), 0);
}
-class CDBInit
+CDBEnv::CDBEnv() : dbenv(0)
{
-public:
- CDBInit()
- {
- }
- ~CDBInit()
- {
- EnvShutdown();
- }
}
-instance_of_cdbinit;
+
+CDBEnv::~CDBEnv()
+{
+ EnvShutdown();
+}
+
+void CDBEnv::Close()
+{
+ EnvShutdown();
+}
+
+bool CDBEnv::Open(boost::filesystem::path pathEnv_)
+{
+ if (fDbEnvInit)
+ return true;
+
+ if (fShutdown)
+ return false;
+
+ pathEnv = pathEnv_;
+ filesystem::path pathDataDir = pathEnv;
+ filesystem::path pathLogDir = pathDataDir / "database";
+ filesystem::create_directory(pathLogDir);
+ filesystem::path pathErrorFile = pathDataDir / "db.log";
+ printf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string().c_str(), pathErrorFile.string().c_str());
+
+ unsigned int nEnvFlags = 0;
+ if (GetBoolArg("-privdb", true))
+ nEnvFlags |= DB_PRIVATE;
+
+ int nDbCache = GetArg("-dbcache", 25);
+ dbenv.set_lg_dir(pathLogDir.string().c_str());
+ dbenv.set_cachesize(nDbCache / 1024, (nDbCache % 1024)*1048576, 1);
+ dbenv.set_lg_bsize(1048576);
+ dbenv.set_lg_max(10485760);
+ dbenv.set_lk_max_locks(10000);
+ dbenv.set_lk_max_objects(10000);
+ dbenv.set_errfile(fopen(pathErrorFile.string().c_str(), "a")); /// debug
+ dbenv.set_flags(DB_AUTO_COMMIT, 1);
+ dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1);
+ dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1);
+ int ret = dbenv.open(pathDataDir.string().c_str(),
+ DB_CREATE |
+ DB_INIT_LOCK |
+ DB_INIT_LOG |
+ DB_INIT_MPOOL |
+ DB_INIT_TXN |
+ DB_THREAD |
+ DB_RECOVER |
+ nEnvFlags,
+ S_IRUSR | S_IWUSR);
+ if (ret > 0)
+ return error("CDB() : error %d opening database environment", ret);
+
+ 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)
+CDB::CDB(const char *pszFile, const char* pszMode) :
+ pdb(NULL), activeTxn(NULL)
{
int ret;
if (pszFile == NULL)
@@ -76,54 +126,17 @@ CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL)
if (fCreate)
nFlags |= DB_CREATE;
- unsigned int nEnvFlags = 0;
- if (GetBoolArg("-privdb", true))
- nEnvFlags |= DB_PRIVATE;
-
{
- LOCK(cs_db);
- if (!fDbEnvInit)
- {
- if (fShutdown)
- return;
- filesystem::path pathDataDir = GetDataDir();
- filesystem::path pathLogDir = pathDataDir / "database";
- filesystem::create_directory(pathLogDir);
- filesystem::path pathErrorFile = pathDataDir / "db.log";
- printf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string().c_str(), pathErrorFile.string().c_str());
-
- int nDbCache = GetArg("-dbcache", 25);
- dbenv.set_lg_dir(pathLogDir.string().c_str());
- dbenv.set_cachesize(nDbCache / 1024, (nDbCache % 1024)*1048576, 1);
- dbenv.set_lg_bsize(1048576);
- dbenv.set_lg_max(10485760);
- dbenv.set_lk_max_locks(10000);
- dbenv.set_lk_max_objects(10000);
- 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.log_set_config(DB_LOG_AUTO_REMOVE, 1);
- ret = dbenv.open(pathDataDir.string().c_str(),
- DB_CREATE |
- DB_INIT_LOCK |
- DB_INIT_LOG |
- DB_INIT_MPOOL |
- DB_INIT_TXN |
- DB_THREAD |
- DB_RECOVER |
- nEnvFlags,
- S_IRUSR | S_IWUSR);
- if (ret > 0)
- throw runtime_error(strprintf("CDB() : error %d opening database environment", ret));
- fDbEnvInit = true;
- }
+ LOCK(bitdb.cs_db);
+ if (!bitdb.Open(GetDataDir()))
+ throw runtime_error("env open failed");
strFile = pszFile;
- ++mapFileUseCount[strFile];
- pdb = mapDb[strFile];
+ ++bitdb.mapFileUseCount[strFile];
+ pdb = bitdb.mapDb[strFile];
if (pdb == NULL)
{
- pdb = new Db(&dbenv, 0);
+ pdb = new Db(&bitdb.dbenv, 0);
ret = pdb->open(NULL, // Txn pointer
pszFile, // Filename
@@ -137,8 +150,8 @@ CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL)
delete pdb;
pdb = NULL;
{
- LOCK(cs_db);
- --mapFileUseCount[strFile];
+ LOCK(bitdb.cs_db);
+ --bitdb.mapFileUseCount[strFile];
}
strFile = "";
throw runtime_error(strprintf("CDB() : can't open database file %s, error %d", pszFile, ret));
@@ -152,7 +165,7 @@ CDB::CDB(const char *pszFile, const char* pszMode) : pdb(NULL)
fReadOnly = fTmp;
}
- mapDb[strFile] = pdb;
+ bitdb.mapDb[strFile] = pdb;
}
}
}
@@ -161,9 +174,9 @@ void CDB::Close()
{
if (!pdb)
return;
- if (!vTxn.empty())
- vTxn.front()->abort();
- vTxn.clear();
+ if (activeTxn)
+ activeTxn->abort();
+ activeTxn = NULL;
pdb = NULL;
// Flush database activity from memory pool to disk log
@@ -175,15 +188,15 @@ void CDB::Close()
if (strFile == "blkindex.dat" && IsInitialBlockDownload())
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);
- --mapFileUseCount[strFile];
+ LOCK(bitdb.cs_db);
+ --bitdb.mapFileUseCount[strFile];
}
}
-void CloseDb(const string& strFile)
+void CDBEnv::CloseDb(const string& strFile)
{
{
LOCK(cs_db);
@@ -203,21 +216,20 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
while (!fShutdown)
{
{
- LOCK(cs_db);
- if (!mapFileUseCount.count(strFile) || mapFileUseCount[strFile] == 0)
+ LOCK(bitdb.cs_db);
+ if (!bitdb.mapFileUseCount.count(strFile) || bitdb.mapFileUseCount[strFile] == 0)
{
// Flush log data to the dat file
- CloseDb(strFile);
- dbenv.txn_checkpoint(0, 0, 0);
- dbenv.lsn_reset(strFile.c_str(), 0);
- mapFileUseCount.erase(strFile);
+ bitdb.CloseDb(strFile);
+ bitdb.CheckpointLSN(strFile);
+ bitdb.mapFileUseCount.erase(strFile);
bool fSuccess = true;
printf("Rewriting %s...\n", strFile.c_str());
string strFileRes = strFile + ".rewrite";
{ // surround usage of db with extra {}
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
strFileRes.c_str(), // Filename
@@ -267,7 +279,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
if (fSuccess)
{
db.Close();
- CloseDb(strFile);
+ bitdb.CloseDb(strFile);
if (pdbCopy->close(0))
fSuccess = false;
delete pdbCopy;
@@ -275,10 +287,10 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
}
if (fSuccess)
{
- Db dbA(&dbenv, 0);
+ Db dbA(&bitdb.dbenv, 0);
if (dbA.remove(strFile.c_str(), NULL, 0))
fSuccess = false;
- Db dbB(&dbenv, 0);
+ Db dbB(&bitdb.dbenv, 0);
if (dbB.rename(strFileRes.c_str(), NULL, strFile.c_str(), 0))
fSuccess = false;
}
@@ -293,12 +305,12 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
}
-void DBFlush(bool fShutdown)
+void CDBEnv::Flush(bool fShutdown)
{
int64 nStart = GetTimeMillis();
// Flush log data to the actual data file
// 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)
return;
{
@@ -332,7 +344,7 @@ void DBFlush(bool fShutdown)
if (mapFileUseCount.empty())
{
dbenv.log_archive(&listp, DB_ARCH_REMOVE);
- EnvShutdown();
+ Close();
}
}
}
diff --git a/src/db.h b/src/db.h
index a67193b680..4919284a3d 100644
--- a/src/db.h
+++ b/src/db.h
@@ -25,21 +25,56 @@ class CWallet;
class CWalletTx;
extern unsigned int nWalletDBUpdated;
-extern bool fDetachDB;
-extern DbEnv dbenv;
-extern void DBFlush(bool fShutdown);
void ThreadFlushWalletDB(void* parg);
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;
+ std::map<std::string, int> mapFileUseCount;
+ std::map<std::string, Db*> mapDb;
+
+ 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_; }
+
+ void CloseDb(const std::string& strFile);
+
+ DbTxn *TxnBegin(int flags=DB_TXN_WRITE_NOSYNC)
+ {
+ DbTxn* ptxn = NULL;
+ int ret = dbenv.txn_begin(NULL, &ptxn, flags);
+ if (!ptxn || ret != 0)
+ return NULL;
+ return ptxn;
+ }
+};
+
+extern CDBEnv bitdb;
+
+
/** RAII class that provides access to a Berkeley database */
class CDB
{
protected:
Db* pdb;
std::string strFile;
- std::vector<DbTxn*> vTxn;
+ DbTxn *activeTxn;
bool fReadOnly;
explicit CDB(const char* pszFile, const char* pszMode="r+");
@@ -66,7 +101,7 @@ protected:
// Read
Dbt datValue;
datValue.set_flags(DB_DBT_MALLOC);
- int ret = pdb->get(GetTxn(), &datKey, &datValue, 0);
+ int ret = pdb->get(activeTxn, &datKey, &datValue, 0);
memset(datKey.get_data(), 0, datKey.get_size());
if (datValue.get_data() == NULL)
return false;
@@ -107,7 +142,7 @@ protected:
Dbt datValue(&ssValue[0], ssValue.size());
// Write
- int ret = pdb->put(GetTxn(), &datKey, &datValue, (fOverwrite ? 0 : DB_NOOVERWRITE));
+ int ret = pdb->put(activeTxn, &datKey, &datValue, (fOverwrite ? 0 : DB_NOOVERWRITE));
// Clear memory in case it was a private key
memset(datKey.get_data(), 0, datKey.get_size());
@@ -130,7 +165,7 @@ protected:
Dbt datKey(&ssKey[0], ssKey.size());
// Erase
- int ret = pdb->del(GetTxn(), &datKey, 0);
+ int ret = pdb->del(activeTxn, &datKey, 0);
// Clear memory
memset(datKey.get_data(), 0, datKey.get_size());
@@ -150,7 +185,7 @@ protected:
Dbt datKey(&ssKey[0], ssKey.size());
// Exists
- int ret = pdb->exists(GetTxn(), &datKey, 0);
+ int ret = pdb->exists(activeTxn, &datKey, 0);
// Clear memory
memset(datKey.get_data(), 0, datKey.get_size());
@@ -207,46 +242,33 @@ protected:
return 0;
}
- DbTxn* GetTxn()
- {
- if (!vTxn.empty())
- return vTxn.back();
- else
- return NULL;
- }
-
public:
bool TxnBegin()
{
- if (!pdb)
+ if (!pdb || activeTxn)
return false;
- DbTxn* ptxn = NULL;
- int ret = dbenv.txn_begin(GetTxn(), &ptxn, DB_TXN_WRITE_NOSYNC);
- if (!ptxn || ret != 0)
+ DbTxn* ptxn = bitdb.TxnBegin();
+ if (!ptxn)
return false;
- vTxn.push_back(ptxn);
+ activeTxn = ptxn;
return true;
}
bool TxnCommit()
{
- if (!pdb)
+ if (!pdb || !activeTxn)
return false;
- if (vTxn.empty())
- return false;
- int ret = vTxn.back()->commit(0);
- vTxn.pop_back();
+ int ret = activeTxn->commit(0);
+ activeTxn = NULL;
return (ret == 0);
}
bool TxnAbort()
{
- if (!pdb)
- return false;
- if (vTxn.empty())
+ if (!pdb || !activeTxn)
return false;
- int ret = vTxn.back()->abort();
- vTxn.pop_back();
+ int ret = activeTxn->abort();
+ activeTxn = NULL;
return (ret == 0);
}
diff --git a/src/init.cpp b/src/init.cpp
index f5eac511aa..c01dc27086 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -56,9 +56,9 @@ void Shutdown(void* parg)
{
fShutdown = true;
nTransactionsUpdated++;
- DBFlush(false);
+ bitdb.Flush(false);
StopNode();
- DBFlush(true);
+ bitdb.Flush(true);
boost::filesystem::remove(GetPidFile());
UnregisterWallet(pwalletMain);
delete pwalletMain;
@@ -335,7 +335,7 @@ bool AppInit2()
// ********************************************************* Step 3: parameter-to-internal-flags
fDebug = GetBoolArg("-debug");
- fDetachDB = GetBoolArg("-detachdb", false);
+ bitdb.SetDetach(GetBoolArg("-detachdb", false));
#if !defined(WIN32) && !defined(QT_GUI)
fDaemon = GetBoolArg("-daemon");
diff --git a/src/main.cpp b/src/main.cpp
index 546f8542a9..9a4d7abc8c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1463,7 +1463,6 @@ bool static Reorganize(CTxDB& txdb, CBlockIndex* pindexNew)
if (!block.ConnectBlock(txdb, pindex))
{
// Invalid block
- txdb.TxnAbort();
return error("Reorganize() : ConnectBlock %s failed", pindex->GetBlockHash().ToString().substr(0,20).c_str());
}
diff --git a/src/walletdb.cpp b/src/walletdb.cpp
index 86cab4ab2b..2d44e4982f 100644
--- a/src/walletdb.cpp
+++ b/src/walletdb.cpp
@@ -13,10 +13,6 @@ using namespace boost;
static uint64 nAccountingEntryNumber = 0;
-extern CCriticalSection cs_db;
-extern map<string, int> mapFileUseCount;
-extern void CloseDb(const string& strFile);
-
//
// CWalletDB
//
@@ -350,13 +346,13 @@ void ThreadFlushWalletDB(void* parg)
if (nLastFlushed != nWalletDBUpdated && GetTime() - nLastWalletUpdate >= 2)
{
- TRY_LOCK(cs_db,lockDb);
+ TRY_LOCK(bitdb.cs_db,lockDb);
if (lockDb)
{
// Don't do this if any databases are in use
int nRefCount = 0;
- map<string, int>::iterator mi = mapFileUseCount.begin();
- while (mi != mapFileUseCount.end())
+ map<string, int>::iterator mi = bitdb.mapFileUseCount.begin();
+ while (mi != bitdb.mapFileUseCount.end())
{
nRefCount += (*mi).second;
mi++;
@@ -364,19 +360,18 @@ void ThreadFlushWalletDB(void* parg)
if (nRefCount == 0 && !fShutdown)
{
- map<string, int>::iterator mi = mapFileUseCount.find(strFile);
- if (mi != mapFileUseCount.end())
+ map<string, int>::iterator mi = bitdb.mapFileUseCount.find(strFile);
+ if (mi != bitdb.mapFileUseCount.end())
{
printf("Flushing wallet.dat\n");
nLastFlushed = nWalletDBUpdated;
int64 nStart = GetTimeMillis();
// Flush wallet.dat so it's self contained
- CloseDb(strFile);
- dbenv.txn_checkpoint(0, 0, 0);
- dbenv.lsn_reset(strFile.c_str(), 0);
+ bitdb.CloseDb(strFile);
+ bitdb.CheckpointLSN(strFile);
- mapFileUseCount.erase(mi++);
+ bitdb.mapFileUseCount.erase(mi++);
printf("Flushed wallet.dat %"PRI64d"ms\n", GetTimeMillis() - nStart);
}
}
@@ -392,14 +387,13 @@ bool BackupWallet(const CWallet& wallet, const string& strDest)
while (!fShutdown)
{
{
- LOCK(cs_db);
- if (!mapFileUseCount.count(wallet.strWalletFile) || mapFileUseCount[wallet.strWalletFile] == 0)
+ LOCK(bitdb.cs_db);
+ if (!bitdb.mapFileUseCount.count(wallet.strWalletFile) || bitdb.mapFileUseCount[wallet.strWalletFile] == 0)
{
// Flush log data to the dat file
- CloseDb(wallet.strWalletFile);
- dbenv.txn_checkpoint(0, 0, 0);
- dbenv.lsn_reset(wallet.strWalletFile.c_str(), 0);
- mapFileUseCount.erase(wallet.strWalletFile);
+ bitdb.CloseDb(wallet.strWalletFile);
+ bitdb.CheckpointLSN(wallet.strWalletFile);
+ bitdb.mapFileUseCount.erase(wallet.strWalletFile);
// Copy wallet.dat
filesystem::path pathSrc = GetDataDir() / wallet.strWalletFile;