changeset 26719:ac1f0f9aff5d

Merge #9833: Trivial: fix comments referencing AppInit2 ef9f495 Trivial: fix comments referencing AppInit2 (Marko Bencun)
author Wladimir J. van der Laan <laanwj@gmail.com>
date Fri, 24 Feb 2017 10:53:24 +0100
parents b3d729708a34 a053f5f4c8e4
children a8520fefcedf
files
diffstat 3 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/init.cpp	Fri Feb 24 10:21:59 2017 +0100
+++ b/src/init.cpp	Fri Feb 24 10:53:24 2017 +0100
@@ -118,10 +118,6 @@
 // threads that should only be stopped after the main network-processing
 // threads have exited.
 //
-// Note that if running -daemon the parent process returns from AppInit2
-// before adding any threads to the threadGroup, so .join_all() returns
-// immediately and the parent exits from main().
-//
 // Shutdown for Qt is very similar, only it uses a QTimer to detect
 // fRequestShutdown getting set, and then does the normal Qt
 // shutdown thing.
@@ -188,7 +184,7 @@
     if (!lockShutdown)
         return;
 
-    /// Note: Shutdown() must be able to handle cases in which AppInit2() failed part of the way,
+    /// Note: Shutdown() must be able to handle cases in which initialization failed part of the way,
     /// for example if the data directory was found to be locked.
     /// Be sure that anything that writes files or flushes caches only does this if the respective
     /// module was initialized.
--- a/src/qt/bitcoin.cpp	Fri Feb 24 10:21:59 2017 +0100
+++ b/src/qt/bitcoin.cpp	Fri Feb 24 10:53:24 2017 +0100
@@ -268,7 +268,7 @@
 {
     try
     {
-        qDebug() << __func__ << ": Running AppInit2 in thread";
+        qDebug() << __func__ << ": Running initialization in thread";
         if (!AppInitBasicSetup())
         {
             Q_EMIT initializeResult(false);
@@ -457,7 +457,7 @@
     returnValue = retval ? 0 : 1;
     if(retval)
     {
-        // Log this only after AppInit2 finishes, as then logging setup is guaranteed complete
+        // Log this only after AppInitMain finishes, as then logging setup is guaranteed complete
         qWarning() << "Platform customization:" << platformStyle->getName();
 #ifdef ENABLE_WALLET
         PaymentServer::LoadRootCAs();
--- a/src/script/sigcache.cpp	Fri Feb 24 10:21:59 2017 +0100
+++ b/src/script/sigcache.cpp	Fri Feb 24 10:53:24 2017 +0100
@@ -90,7 +90,8 @@
 static CSignatureCache signatureCache;
 }
 
-// To be called once in AppInit2/TestingSetup to initialize the signatureCache
+// To be called once in AppInitMain/BasicTestingSetup to initialize the
+// signatureCache.
 void InitSignatureCache()
 {
     // nMaxCacheSize is unsigned. If -maxsigcachesize is set to zero,