aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-01-11 22:57:22 +0100
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-01-11 22:57:22 +0100
commitbb41a87d57ac885dcd951a11827ca57329224802 (patch)
tree95b835188dd07de269bd06d357a7078a05ba7a67
parente0c8fbac351bfa5e036c1c00ce0525c3649ab29c (diff)
downloadbitcoin-bb41a87d57ac885dcd951a11827ca57329224802.tar.xz
add InitMessage() to noui and use debug.log for GUI
- this pull adds an InitMessage() function to noui.cpp, which outputs init messages to debug.log (this allows to remove some printf() calls from init.cpp) - change InitMessage() in bitcoin.cpp to also write init messages to debug.log to ensure nothting is missing in the log because of the removal of printf() calls in init.cpp
-rw-r--r--src/init.cpp7
-rw-r--r--src/noui.cpp6
-rw-r--r--src/qt/bitcoin.cpp1
3 files changed, 10 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 79e9b2fb10..87650bb9b5 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -742,7 +742,7 @@ bool AppInit2()
nCoinCacheSize = nTotalCache / 300; // coins in memory require around 300 bytes
uiInterface.InitMessage(_("Loading block index..."));
- printf("Loading block index...\n");
+
nStart = GetTimeMillis();
pblocktree = new CBlockTreeDB(nBlockTreeDBCache, false, fReindex);
pcoinsdbview = new CCoinsViewDB(nCoinDBCache, false, fReindex);
@@ -799,7 +799,7 @@ bool AppInit2()
// ********************************************************* Step 8: load wallet
uiInterface.InitMessage(_("Loading wallet..."));
- printf("Loading wallet...\n");
+
nStart = GetTimeMillis();
bool fFirstRun = true;
pwalletMain = new CWallet("wallet.dat");
@@ -897,7 +897,7 @@ bool AppInit2()
// ********************************************************* Step 10: load peers
uiInterface.InitMessage(_("Loading addresses..."));
- printf("Loading addresses...\n");
+
nStart = GetTimeMillis();
{
@@ -932,7 +932,6 @@ bool AppInit2()
// ********************************************************* Step 12: finished
uiInterface.InitMessage(_("Done loading"));
- printf("Done loading\n");
if (!strErrors.str().empty())
return InitError(strErrors.str());
diff --git a/src/noui.cpp b/src/noui.cpp
index 96a8de4ee9..302d059291 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -37,9 +37,15 @@ static bool noui_ThreadSafeAskFee(int64 /*nFeeRequired*/)
return true;
}
+static void noui_InitMessage(const std::string &message)
+{
+ printf("init message: %s\n", message.c_str());
+}
+
void noui_connect()
{
// Connect bitcoind signal handlers
uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox);
uiInterface.ThreadSafeAskFee.connect(noui_ThreadSafeAskFee);
+ uiInterface.InitMessage.connect(noui_InitMessage);
}
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index c3701ced7f..e5526a6c09 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -86,6 +86,7 @@ static void InitMessage(const std::string &message)
splashref->showMessage(QString::fromStdString(message), Qt::AlignBottom|Qt::AlignHCenter, QColor(255,255,200));
QApplication::instance()->processEvents();
}
+ printf("init message: %s\n", message.c_str());
}
static void QueueShutdown()