#include "ui_interface.h"
#include <boost/filesystem.hpp>
-#include <boost/filesystem/fstream.hpp>
#ifndef WIN32
#include "sys/stat.h"
#endif
using namespace std;
-using namespace boost;
-
-unsigned int nWalletDBUpdated;
+uint32_t nWalletDBUpdated;
extern bool fUseMemoryLog;
-
//
// CDB
//
return false;
pathEnv = pathEnv_;
- filesystem::path pathDataDir = pathEnv;
+ boost::filesystem::path pathDataDir = pathEnv;
strPath = pathDataDir.string();
- filesystem::path pathLogDir = pathDataDir / "database";
- filesystem::create_directory(pathLogDir);
- filesystem::path pathErrorFile = pathDataDir / "db.log";
+ boost::filesystem::path pathLogDir = pathDataDir / "database";
+ boost::filesystem::create_directory(pathLogDir);
+ boost::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;
+ uint32_t nEnvFlags = 0;
if (GetBoolArg("-privdb", true))
nEnvFlags |= DB_PRIVATE;
if (!dbenv.get_lk_max_locks(&nMaxLocks))
{
int nBlocks, nDeepReorg;
- std::string strMessage;
+ string strMessage;
nBlocks = nMaxLocks / 48768;
nDeepReorg = (nBlocks - 1) / 2;
return true;
}
-CDBEnv::VerifyResult CDBEnv::Verify(std::string strFile, bool (*recoverFunc)(CDBEnv& dbenv, std::string strFile))
+CDBEnv::VerifyResult CDBEnv::Verify(string strFile, bool (*recoverFunc)(CDBEnv& dbenv, string strFile))
{
LOCK(cs_db);
assert(mapFileUseCount.count(strFile) == 0);
return (fRecovered ? RECOVER_OK : RECOVER_FAIL);
}
-bool CDBEnv::Salvage(std::string strFile, bool fAggressive,
- std::vector<CDBEnv::KeyValPair >& vResult)
+bool CDBEnv::Salvage(string strFile, bool fAggressive,
+ vector<CDBEnv::KeyValPair >& vResult)
{
LOCK(cs_db);
assert(mapFileUseCount.count(strFile) == 0);
while (!strDump.eof() && strLine != "HEADER=END")
getline(strDump, strLine); // Skip past header
- std::string keyHex, valueHex;
+ string keyHex, valueHex;
while (!strDump.eof() && keyHex != "DATA=END")
{
getline(strDump, keyHex);
}
-void CDBEnv::CheckpointLSN(std::string strFile)
+void CDBEnv::CheckpointLSN(string strFile)
{
dbenv.txn_checkpoint(0, 0, 0);
if (fMockDb)
CDB::CDB(const char *pszFile, const char* pszMode) :
- pdb(NULL), activeTxn(NULL)
+ pdb(NULL), activeTxn(NULL), fReadOnly(true)
{
int ret;
if (pszFile == NULL)
fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
bool fCreate = strchr(pszMode, 'c') != NULL;
- unsigned int nFlags = DB_THREAD;
+ uint32_t nFlags = DB_THREAD;
if (fCreate)
nFlags |= DB_CREATE;
}
}
-static bool IsChainFile(std::string strFile)
+static bool IsChainFile(string strFile)
{
if (strFile == "blkindex.dat")
return true;
pdb = NULL;
// Flush database activity from memory pool to disk log
- unsigned int nMinutes = 0;
+ uint32_t nMinutes = 0;
if (fReadOnly)
nMinutes = 1;
if (IsChainFile(strFile))
return (rc == 0);
}
+DbTxn *CDBEnv::TxnBegin(int flags)
+{
+ DbTxn* ptxn = NULL;
+ int ret = dbenv.txn_begin(NULL, &ptxn, flags);
+ if (!ptxn || ret != 0)
+ return NULL;
+ return ptxn;
+}
+
+Dbc* CDB::GetCursor()
+{
+ if (!pdb)
+ return NULL;
+ Dbc* pcursor = NULL;
+ int ret = pdb->cursor(NULL, &pcursor, 0);
+ if (ret != 0)
+ return NULL;
+ return pcursor;
+}
+
+int CDB::ReadAtCursor(Dbc* pcursor, CDataStream& ssKey, CDataStream& ssValue, unsigned int fFlags)
+{
+ // Read at cursor
+ Dbt datKey;
+ if (fFlags == DB_SET || fFlags == DB_SET_RANGE || fFlags == DB_GET_BOTH || fFlags == DB_GET_BOTH_RANGE)
+ {
+ datKey.set_data(&ssKey[0]);
+ datKey.set_size((uint32_t)ssKey.size());
+ }
+ Dbt datValue;
+ if (fFlags == DB_GET_BOTH || fFlags == DB_GET_BOTH_RANGE)
+ {
+ datValue.set_data(&ssValue[0]);
+ datValue.set_size((uint32_t)ssValue.size());
+ }
+ datKey.set_flags(DB_DBT_MALLOC);
+ datValue.set_flags(DB_DBT_MALLOC);
+ int ret = pcursor->get(&datKey, &datValue, fFlags);
+ if (ret != 0)
+ return ret;
+ else if (datKey.get_data() == NULL || datValue.get_data() == NULL)
+ return 99999;
+
+ // Convert to streams
+ ssKey.SetType(SER_DISK);
+ ssKey.clear();
+ ssKey.write((char*)datKey.get_data(), datKey.get_size());
+ ssValue.SetType(SER_DISK);
+ ssValue.clear();
+ ssValue.write((char*)datValue.get_data(), datValue.get_size());
+
+ // Clear and free memory
+ memset(datKey.get_data(), 0, datKey.get_size());
+ memset(datValue.get_data(), 0, datValue.get_size());
+ free(datKey.get_data());
+ free(datValue.get_data());
+ return 0;
+}
+
+bool CDB::TxnBegin()
+{
+ if (!pdb || activeTxn)
+ return false;
+ DbTxn* ptxn = bitdb.TxnBegin();
+ if (!ptxn)
+ return false;
+ activeTxn = ptxn;
+ return true;
+}
+
+bool CDB::TxnCommit()
+{
+ if (!pdb || !activeTxn)
+ return false;
+ int ret = activeTxn->commit(0);
+ activeTxn = NULL;
+ return (ret == 0);
+}
+
+bool CDB::TxnAbort()
+{
+ if (!pdb || !activeTxn)
+ return false;
+ int ret = activeTxn->abort();
+ activeTxn = NULL;
+ return (ret == 0);
+}
+
+bool CDB::ReadVersion(int& nVersion)
+{
+ nVersion = 0;
+ return Read(std::string("version"), nVersion);
+}
+
+bool CDB::WriteVersion(int nVersion)
+{
+ return Write(std::string("version"), nVersion);
+}
+
bool CDB::Rewrite(const string& strFile, const char* pszSkip)
{
while (!fShutdown)
if (pszSkip != NULL)
{
size_t pszSkipLen = strlen(pszSkip);
- if (strncmp(&ssKey[0], pszSkip, std::min(ssKey.size(), pszSkipLen)) == 0)
+ if (strncmp(&ssKey[0], pszSkip, min(ssKey.size(), pszSkipLen)) == 0)
continue;
}
// Generate random temporary filename
unsigned short randv = 0;
RAND_bytes((unsigned char *)&randv, sizeof(randv));
- std::string tmpfn = strprintf("peers.dat.%04x", randv);
+ string tmpfn = strprintf("peers.dat.%04x", randv);
// serialize addresses, checksum data up to that point, then append csum
CDataStream ssPeers(SER_DISK, CLIENT_VERSION);
try {
fileout << ssPeers;
}
- catch (const std::exception&) {
+ catch (const exception&) {
return error("CAddrman::Write() : I/O error");
}
FileCommit(fileout);
filein.read((char *)&vchData[0], dataSize);
filein >> hashIn;
}
- catch (const std::exception&) {
+ catch (const 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 (const std::exception&) {
+ catch (const exception&) {
return error("CAddrman::Read() : I/O error or stream data corrupted");
}
git://git.novaco.in / novacoin.git / blobdiff