unsigned int nWalletDBUpdated;
-
+extern bool fUseMemoryLog;
//
DbEnv(0).remove(strPath.c_str(), 0);
}
-CDBEnv::CDBEnv() : dbenv(DB_CXX_NO_EXCEPTIONS)
-{
- fDbEnvInit = false;
- fMockDb = false;
-}
+CDBEnv::CDBEnv() : fDetachDB(false), fDbEnvInit(false), fMockDb(false), dbenv(DB_CXX_NO_EXCEPTIONS) { }
CDBEnv::~CDBEnv()
{
if (GetBoolArg("-privdb", true))
nEnvFlags |= DB_PRIVATE;
- int nDbCache = GetArg("-dbcache", 25);
+ int nDbCache = GetArgInt("-dbcache", 25);
dbenv.set_lg_dir(pathLogDir.string().c_str());
dbenv.set_cachesize(nDbCache / 1024, (nDbCache % 1024)*1048576, 1);
dbenv.set_lg_bsize(1048576);
fDbEnvInit = true;
fMockDb = false;
+#ifndef USE_LEVELDB
// Check that the number of locks is sufficient (to prevent chain fork possibility, read http://bitcoin.org/may15 for more info)
u_int32_t nMaxLocks;
if (!dbenv.get_lk_max_locks(&nMaxLocks))
nBlocks = nMaxLocks / 48768;
nDeepReorg = (nBlocks - 1) / 2;
- printf("Final lk_max_locks is %lu, sufficient for (worst case) %d block%s in a single transaction (up to a %d-deep reorganization)\n", (unsigned long)nMaxLocks, nBlocks, (nBlocks == 1) ? "" : "s", nDeepReorg);
+ printf("Final lk_max_locks is %u, sufficient for (worst case) %d block%s in a single transaction (up to a %d-deep reorganization)\n", nMaxLocks, nBlocks, (nBlocks == 1) ? "" : "s", nDeepReorg);
if (nDeepReorg < 3)
{
if (nBlocks < 1)
- strMessage = strprintf(_("Warning: DB_CONFIG has set_lk_max_locks %lu, which may be too low for a single block. If this limit is reached, NovaCoin may stop working."), (unsigned long)nMaxLocks);
+ strMessage = strprintf(_("Warning: DB_CONFIG has set_lk_max_locks %u, which may be too low for a single block. If this limit is reached, NovaCoin may stop working."), nMaxLocks);
else
- strMessage = strprintf(_("Warning: DB_CONFIG has set_lk_max_locks %lu, which may be too low for a common blockchain reorganization. If this limit is reached, NovaCoin may stop working."), (unsigned long)nMaxLocks);
+ strMessage = strprintf(_("Warning: DB_CONFIG has set_lk_max_locks %u, which may be too low for a common blockchain reorganization. If this limit is reached, NovaCoin may stop working."), nMaxLocks);
strMiscWarning = strMessage;
printf("*** %s\n", strMessage.c_str());
}
}
+#endif
return true;
}
dbenv.set_lk_max_objects(10000);
dbenv.set_flags(DB_AUTO_COMMIT, 1);
#ifdef DB_LOG_IN_MEMORY
- dbenv.log_set_config(DB_LOG_IN_MEMORY, 1);
+ dbenv.log_set_config(DB_LOG_IN_MEMORY, fUseMemoryLog ? 1 : 0);
#endif
int ret = dbenv.open(NULL,
DB_CREATE |
while (!strDump.eof() && keyHex != "DATA=END")
{
getline(strDump, keyHex);
- if (keyHex != "DATA_END")
+ if (keyHex != "DATA=END")
{
getline(strDump, valueHex);
vResult.push_back(make_pair(ParseHex(keyHex),ParseHex(valueHex)));
return;
fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
- bool fCreate = strchr(pszMode, 'c');
+ bool fCreate = strchr(pszMode, 'c') != NULL;
unsigned int nFlags = DB_THREAD;
if (fCreate)
nFlags |= DB_CREATE;
if (IsChainFile(strFile) && IsInitialBlockDownload())
nMinutes = 5;
- bitdb.dbenv.txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100)*1024 : 0, nMinutes, 0);
+ bitdb.dbenv.txn_checkpoint(nMinutes ? GetArgUInt("-dblogsize", 100)*1024 : 0, nMinutes, 0);
{
LOCK(bitdb.cs_db);
}
Dbc* pcursor = db.GetCursor();
- if (pcursor)
+ if (pcursor) {
while (fSuccess)
{
CDataStream ssKey(SER_DISK, CLIENT_VERSION);
fSuccess = false;
break;
}
- if (pszSkip &&
- strncmp(&ssKey[0], pszSkip, std::min(ssKey.size(), strlen(pszSkip))) == 0)
- continue;
+
+ if (pszSkip != NULL)
+ {
+ size_t pszSkipLen = strlen(pszSkip);
+ if (strncmp(&ssKey[0], pszSkip, std::min(ssKey.size(), pszSkipLen)) == 0)
+ continue;
+ }
+
if (strncmp(&ssKey[0], "\x07version", 8) == 0)
{
// Update version:
if (ret2 > 0)
fSuccess = false;
}
+ }
if (fSuccess)
{
db.Close();
void CDBEnv::Flush(bool fShutdown)
{
- int64 nStart = GetTimeMillis();
+ int64_t nStart = GetTimeMillis();
// Flush log data to the actual data file
// on all files that are not in use
printf("Flush(%s)%s\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started");
else
mi++;
}
- printf("DBFlush(%s)%s ended %15"PRI64d"ms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started", GetTimeMillis() - nStart);
+ printf("DBFlush(%s)%s ended %15" PRId64 "ms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started", GetTimeMillis() - nStart);
if (fShutdown)
{
char** listp;
try {
fileout << ssPeers;
}
- catch (std::exception &e) {
+ catch (const std::exception&) {
return error("CAddrman::Write() : I/O error");
}
FileCommit(fileout);
filein.read((char *)&vchData[0], dataSize);
filein >> hashIn;
}
- catch (std::exception &e) {
+ catch (const std::exception&) {
return error("CAddrman::Read() 2 : I/O error or stream data corrupted");
}
filein.fclose();
// de-serialize address data into one CAddrMan object
ssPeers >> addr;
}
- catch (std::exception &e) {
+ catch (const std::exception&) {
return error("CAddrman::Read() : I/O error or stream data corrupted");
}