Mercurial > hg > bitcoin
changeset 301:55442696faa0 draft
Make OutputDebugStringF thread-safe again (thanks ArtForz for catching)
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@182 1a98c847-1fd6-4fd8-948a-caf3550aa51b
author | gavinandresen <gavinandresen@1a98c847-1fd6-4fd8-948a-caf3550aa51b> |
---|---|
date | Tue, 16 Nov 2010 17:41:44 +0000 |
parents | 015d5de83339 |
children | 364320c61656 |
files | util.cpp |
diffstat | 1 files changed, 26 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/util.cpp +++ b/util.cpp @@ -145,6 +145,8 @@ inline int OutputDebugStringF(const char* pszFormat, ...) { + static CCriticalSection cs_OutputDebugStringF; + int ret = 0; if (fPrintToConsole) { @@ -156,29 +158,32 @@ } else { - // print to debug.log - static FILE* fileout = NULL; - static int64 nOpenTime = 0; + CRITICAL_BLOCK(cs_OutputDebugStringF) + { + // print to debug.log + static FILE* fileout = NULL; + static int64 nOpenTime = 0; - if (GetTime()-nOpenTime > 10 * 60) - { + if (GetTime()-nOpenTime > 10 * 60) + { + if (fileout) + fclose(fileout); + char pszFile[MAX_PATH+100]; + GetDataDir(pszFile); + strlcat(pszFile, "/debug.log", sizeof(pszFile)); + fileout = fopen(pszFile, "a"); + nOpenTime = GetTime(); + } if (fileout) - fclose(fileout); - char pszFile[MAX_PATH+100]; - GetDataDir(pszFile); - strlcat(pszFile, "/debug.log", sizeof(pszFile)); - fileout = fopen(pszFile, "a"); - nOpenTime = GetTime(); - } - if (fileout) - { - //// Debug print useful for profiling - //fprintf(fileout, " %"PRI64d" ", GetTimeMillis()); - va_list arg_ptr; - va_start(arg_ptr, pszFormat); - ret = vfprintf(fileout, pszFormat, arg_ptr); - va_end(arg_ptr); - fflush(fileout); + { + //// Debug print useful for profiling + //fprintf(fileout, " %"PRI64d" ", GetTimeMillis()); + va_list arg_ptr; + va_start(arg_ptr, pszFormat); + ret = vfprintf(fileout, pszFormat, arg_ptr); + va_end(arg_ptr); + fflush(fileout); + } } } @@ -186,7 +191,6 @@ if (fPrintToDebugger) { // accumulate a line at a time - static CCriticalSection cs_OutputDebugStringF; CRITICAL_BLOCK(cs_OutputDebugStringF) { static char pszBuffer[50000];