mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge branch 'master' of github.com:bitcoin/bitcoin
This commit is contained in:
commit
a1c3d8f14d
47
src/db.cpp
47
src/db.cpp
@ -28,6 +28,7 @@ static bool fDbEnvInit = false;
|
|||||||
DbEnv dbenv(0);
|
DbEnv dbenv(0);
|
||||||
static map<string, int> mapFileUseCount;
|
static map<string, int> mapFileUseCount;
|
||||||
static map<string, Db*> mapDb;
|
static map<string, Db*> mapDb;
|
||||||
|
static int64 nTxn = 0;
|
||||||
|
|
||||||
static void EnvShutdown()
|
static void EnvShutdown()
|
||||||
{
|
{
|
||||||
@ -160,8 +161,15 @@ void CDB::Close()
|
|||||||
nMinutes = 1;
|
nMinutes = 1;
|
||||||
if (strFile == "addr.dat")
|
if (strFile == "addr.dat")
|
||||||
nMinutes = 2;
|
nMinutes = 2;
|
||||||
if (strFile == "blkindex.dat" && IsInitialBlockDownload() && nBestHeight % 5000 != 0)
|
if (strFile == "blkindex.dat" && IsInitialBlockDownload())
|
||||||
nMinutes = 1;
|
nMinutes = 5;
|
||||||
|
|
||||||
|
if (nMinutes == 0 || nTxn > 200000)
|
||||||
|
{
|
||||||
|
nTxn = 0;
|
||||||
|
nMinutes = 0;
|
||||||
|
}
|
||||||
|
|
||||||
dbenv.txn_checkpoint(0, nMinutes, 0);
|
dbenv.txn_checkpoint(0, nMinutes, 0);
|
||||||
|
|
||||||
CRITICAL_BLOCK(cs_db)
|
CRITICAL_BLOCK(cs_db)
|
||||||
@ -336,6 +344,7 @@ bool CTxDB::ReadTxIndex(uint256 hash, CTxIndex& txindex)
|
|||||||
bool CTxDB::UpdateTxIndex(uint256 hash, const CTxIndex& txindex)
|
bool CTxDB::UpdateTxIndex(uint256 hash, const CTxIndex& txindex)
|
||||||
{
|
{
|
||||||
assert(!fClient);
|
assert(!fClient);
|
||||||
|
nTxn++;
|
||||||
return Write(make_pair(string("tx"), hash), txindex);
|
return Write(make_pair(string("tx"), hash), txindex);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -346,6 +355,7 @@ bool CTxDB::AddTxIndex(const CTransaction& tx, const CDiskTxPos& pos, int nHeigh
|
|||||||
// Add to tx index
|
// Add to tx index
|
||||||
uint256 hash = tx.GetHash();
|
uint256 hash = tx.GetHash();
|
||||||
CTxIndex txindex(pos, tx.vout.size());
|
CTxIndex txindex(pos, tx.vout.size());
|
||||||
|
nTxn++;
|
||||||
return Write(make_pair(string("tx"), hash), txindex);
|
return Write(make_pair(string("tx"), hash), txindex);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -722,12 +732,13 @@ bool CAddrDB::WriteAddrman(const CAddrMan& addrman)
|
|||||||
|
|
||||||
bool CAddrDB::LoadAddresses()
|
bool CAddrDB::LoadAddresses()
|
||||||
{
|
{
|
||||||
bool fAddrMan = false;
|
|
||||||
if (Read(string("addrman"), addrman))
|
if (Read(string("addrman"), addrman))
|
||||||
{
|
{
|
||||||
printf("Loaded %i addresses\n", addrman.size());
|
printf("Loaded %i addresses\n", addrman.size());
|
||||||
fAddrMan = true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Read pre-0.6 addr records
|
||||||
|
|
||||||
vector<CAddress> vAddr;
|
vector<CAddress> vAddr;
|
||||||
vector<vector<unsigned char> > vDelete;
|
vector<vector<unsigned char> > vDelete;
|
||||||
@ -753,31 +764,19 @@ bool CAddrDB::LoadAddresses()
|
|||||||
ssKey >> strType;
|
ssKey >> strType;
|
||||||
if (strType == "addr")
|
if (strType == "addr")
|
||||||
{
|
{
|
||||||
if (fAddrMan)
|
CAddress addr;
|
||||||
{
|
ssValue >> addr;
|
||||||
vector<unsigned char> vchKey;
|
vAddr.push_back(addr);
|
||||||
ssKey >> vchKey;
|
|
||||||
vDelete.push_back(vchKey);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
CAddress addr;
|
|
||||||
ssValue >> addr;
|
|
||||||
vAddr.push_back(addr);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pcursor->close();
|
pcursor->close();
|
||||||
|
|
||||||
BOOST_FOREACH(const vector<unsigned char> &vchKey, vDelete)
|
addrman.Add(vAddr, CNetAddr("0.0.0.0"));
|
||||||
Erase(make_pair(string("addr"), vchKey));
|
printf("Loaded %i addresses\n", addrman.size());
|
||||||
|
|
||||||
if (!fAddrMan)
|
// Note: old records left; we ran into hangs-on-startup
|
||||||
{
|
// bugs for some users who (we think) were running after
|
||||||
addrman.Add(vAddr, CNetAddr("0.0.0.0"));
|
// an unclean shutdown.
|
||||||
printf("Loaded %i addresses\n", addrman.size());
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user