Show txdb upgrade progress in debug log

jonasschnelli · jonasschnelli · commit 06c5b6edd332 · 2017-06-29T17:48:12.000+02:00
diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -369,7 +369,8 @@ bool CCoinsViewDB::Upgrade() {
     }
 
     int64_t count = 0;
-    LogPrintf("Upgrading database...\n");
+    LogPrintf("Upgrading utxo-set database...\n");
+    LogPrintf("[0%%]...");
     size_t batch_size = 1 << 24;
     CDBBatch batch(db);
     uiInterface.SetProgressBreakAction(StartShutdown);
@@ -383,6 +384,7 @@ bool CCoinsViewDB::Upgrade() {
             if (count++ % 256 == 0) {
                 uint32_t high = 0x100 * *key.second.begin() + *(key.second.begin() + 1);
                 uiInterface.ShowProgress(_("Upgrading UTXO database") + "\n"+ _("(press q to shutdown and continue later)") + "\n", (int)(high * 100.0 / 65536.0 + 0.5));
+                LogPrintf("[%d%%]...", (int)(high * 100.0 / 65536.0 + 0.5));
             }
             CCoins old_coins;
             if (!pcursor->GetValue(old_coins)) {
@@ -409,5 +411,6 @@ bool CCoinsViewDB::Upgrade() {
     }
     db.WriteBatch(batch);
     uiInterface.SetProgressBreakAction(std::function<void(void)>());
+    LogPrintf("[DONE].\n");
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,8 @@ bool CCoinsViewDB::Upgrade() {`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`int64_t count = 0;`
`372`		`- LogPrintf("Upgrading database...\n");`
	`372`	`+ LogPrintf("Upgrading utxo-set database...\n");`
	`373`	`+ LogPrintf("[0%%]...");`
`373`	`374`	`size_t batch_size = 1 << 24;`
`374`	`375`	`CDBBatch batch(db);`
`375`	`376`	`uiInterface.SetProgressBreakAction(StartShutdown);`
`@@ -383,6 +384,7 @@ bool CCoinsViewDB::Upgrade() {`
`383`	`384`	`if (count++ % 256 == 0) {`
`384`	`385`	`uint32_t high = 0x100 * key.second.begin() + (key.second.begin() + 1);`
`385`	`386`	`uiInterface.ShowProgress(_("Upgrading UTXO database") + "\n"+ _("(press q to shutdown and continue later)") + "\n", (int)(high * 100.0 / 65536.0 + 0.5));`
	`387`	`+ LogPrintf("[%d%%]...", (int)(high * 100.0 / 65536.0 + 0.5));`
`386`	`388`	`}`
`387`	`389`	`CCoins old_coins;`
`388`	`390`	`if (!pcursor->GetValue(old_coins)) {`
`@@ -409,5 +411,6 @@ bool CCoinsViewDB::Upgrade() {`
`409`	`411`	`}`
`410`	`412`	`db.WriteBatch(batch);`
`411`	`413`	`uiInterface.SetProgressBreakAction(std::function<void(void)>());`
	`414`	`+ LogPrintf("[DONE].\n");`
`412`	`415`	`return true;`
`413`	`416`	`}`