Merge branch 'master' of github.com:bitcoin/bitcoin

diff --git a/src/db.cpp b/src/db.cpp
index 2dc86e7..2a09e2e 100644 (file)
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -28,6 +28,7 @@ static bool fDbEnvInit = false;
 DbEnv dbenv(0);
 static map<string, int> mapFileUseCount;
 static map<string, Db*> mapDb;
+static int64 nTxn = 0;
 
 static void EnvShutdown()
 {
@@ -160,8 +161,15 @@ void CDB::Close()
         nMinutes = 1;
     if (strFile == "addr.dat")
         nMinutes = 2;
-    if (strFile == "blkindex.dat" && IsInitialBlockDownload() && nBestHeight % 5000 != 0)
-        nMinutes = 1;
+    if (strFile == "blkindex.dat" && IsInitialBlockDownload())
+        nMinutes = 5;
+
+    if (nMinutes == 0 || nTxn > 200000)
+    {
+        nTxn = 0;
+        nMinutes = 0;
+    }
+
     dbenv.txn_checkpoint(0, nMinutes, 0);
 
     CRITICAL_BLOCK(cs_db)
@@ -336,6 +344,7 @@ bool CTxDB::ReadTxIndex(uint256 hash, CTxIndex& txindex)
 bool CTxDB::UpdateTxIndex(uint256 hash, const CTxIndex& txindex)
 {
     assert(!fClient);
+    nTxn++;
     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
     uint256 hash = tx.GetHash();
     CTxIndex txindex(pos, tx.vout.size());
+    nTxn++;
     return Write(make_pair(string("tx"), hash), txindex);
 }
 
@@ -722,12 +732,13 @@ bool CAddrDB::WriteAddrman(const CAddrMan& addrman)
 
 bool CAddrDB::LoadAddresses()
 {
-    bool fAddrMan = false;
     if (Read(string("addrman"), addrman))
     {
         printf("Loaded %i addresses\n", addrman.size());
-        fAddrMan = true;
+        return true;
     }
+    
+    // Read pre-0.6 addr records
 
     vector<CAddress> vAddr;
     vector<vector<unsigned char> > vDelete;
@@ -753,31 +764,19 @@ bool CAddrDB::LoadAddresses()
         ssKey >> strType;
         if (strType == "addr")
         {
-            if (fAddrMan)
-            {
-                vector<unsigned char> vchKey;
-                ssKey >> vchKey;
-                vDelete.push_back(vchKey);
-            }
-            else
-            {
-                CAddress addr;
-                ssValue >> addr;
-                vAddr.push_back(addr);
-            }
-
+            CAddress addr;
+            ssValue >> addr;
+            vAddr.push_back(addr);
         }
     }
     pcursor->close();
 
-    BOOST_FOREACH(const vector<unsigned char> &vchKey, vDelete)
-        Erase(make_pair(string("addr"), vchKey));
+    addrman.Add(vAddr, CNetAddr("0.0.0.0"));
+    printf("Loaded %i addresses\n", addrman.size());
 
-    if (!fAddrMan)
-    {
-        addrman.Add(vAddr, CNetAddr("0.0.0.0"));
-        printf("Loaded %i addresses\n", addrman.size());
-    }
+    // Note: old records left; we ran into hangs-on-startup
+    // bugs for some users who (we think) were running after
+    // an unclean shutdown.
 
     return true;
 }