Mercurial > hg > bitcoin

changeset 3591:e82d99c8b1b0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid crashes at shutdown due to printf() in global destructors.
author Gavin Andresen <gavinandresen@gmail.com>
date Thu, 04 Oct 2012 16:35:08 -0400
parents 52aa948c2d81
children 5308ff68698a
files src/util.cpp
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -220,8 +220,14 @@
         if (fileout)
         {
             static bool fStartedNewLine = true;
-            static boost::mutex mutexDebugLog;
-            boost::mutex::scoped_lock scoped_lock(mutexDebugLog);
+
+            // This routine may be called by global destructors during shutdown.
+            // Since the order of destruction of static/global objects is undefined,
+            // allocate mutexDebugLog on the heap the first time this routine
+            // is called to avoid crashes during shutdown.
+            static boost::mutex* mutexDebugLog = NULL;
+            if (mutexDebugLog == NULL) mutexDebugLog = new boost::mutex();
+            boost::mutex::scoped_lock scoped_lock(*mutexDebugLog);
 
             // reopen the log file, if requested
             if (fReopenDebugLog) {