updated db.cpp to use make_preferred()

[novacoin.git] / src / db.cpp

diff --git a/src/db.cpp b/src/db.cpp
index c18860a..7bd89b6 100644 (file)
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -79,20 +79,23 @@ CDB::CDB(const char* pszFile, const char* pszMode) : pdb(NULL)
             if (fShutdown)
                 return;
             string strDataDir = GetDataDir();
-            string strLogDir = strDataDir + "/database";
-            filesystem::create_directory(strLogDir.c_str());
-            string strErrorFile = strDataDir + "/db.log";
-            printf("dbenv.open strLogDir=%s strErrorFile=%s\n", strLogDir.c_str(), strErrorFile.c_str());
+            filesystem::path pathLogDir(strDataDir + "/database");
+            pathLogDir.make_preferred();
+            filesystem::create_directory(pathLogDir);
+            filesystem::path pathErrorFile(strDataDir + "/db.log");
+            pathErrorFile.make_preferred();
+            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(strLogDir.c_str());
+            dbenv.set_lg_dir(pathLogDir.string().c_str());
             dbenv.set_cachesize(nDbCache / 1024, (nDbCache % 1024)*1048576, 1);
-            dbenv.set_lg_bsize(10485760);
-            dbenv.set_lg_max(104857600);
+            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(strErrorFile.c_str(), "a")); /// debug
+            dbenv.set_errfile(fopen(pathErrorFile.string().c_str(), "a")); /// debug
             dbenv.set_flags(DB_AUTO_COMMIT, 1);
+            dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1);
             ret = dbenv.open(strDataDir.c_str(),
                              DB_CREATE     |
                              DB_INIT_LOCK  |
@@ -159,9 +162,10 @@ void CDB::Close()
         nMinutes = 1;
     if (strFile == "addr.dat")
         nMinutes = 2;
-    if (strFile == "blkindex.dat" && IsInitialBlockDownload() && nBestHeight % 5000 != 0)
-        nMinutes = 1;
-    dbenv.txn_checkpoint(0, nMinutes, 0);
+    if (strFile == "blkindex.dat" && IsInitialBlockDownload())
+        nMinutes = 5;
+
+    dbenv.txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100)*1024 : 0, nMinutes, 0);
 
     CRITICAL_BLOCK(cs_db)
         --mapFileUseCount[strFile];
@@ -721,12 +725,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;
@@ -752,31 +757,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;
 }
@@ -1181,7 +1174,9 @@ bool BackupWallet(const CWallet& wallet, const string& strDest)
 
                 // Copy wallet.dat
                 filesystem::path pathSrc(GetDataDir() + "/" + wallet.strWalletFile);
+                pathSrc.make_preferred();
                 filesystem::path pathDest(strDest);
+                pathDest.make_preferred();
                 if (filesystem::is_directory(pathDest))
                     pathDest = pathDest / wallet.strWalletFile;