BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
gavinandresen 2010-11-16 17:41:44 +00:00
parent 026c5f7617
commit 2f7a9997c8
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util.cpp
View File

@ -145,6 +145,8 @@ int GetRandInt(int nMax)
inline int OutputDebugStringF(const char* pszFormat, ...) inline int OutputDebugStringF(const char* pszFormat, ...)
{ {
static CCriticalSection cs_OutputDebugStringF;
int ret = 0; int ret = 0;
if (fPrintToConsole) if (fPrintToConsole)
{ {
@ -155,6 +157,8 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
va_end(arg_ptr); va_end(arg_ptr);
} }
else else
{
CRITICAL_BLOCK(cs_OutputDebugStringF)
{ {
// print to debug.log // print to debug.log
static FILE* fileout = NULL; static FILE* fileout = NULL;
@ -181,12 +185,12 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
fflush(fileout); fflush(fileout);
} }
} }
}
#ifdef __WXMSW__ #ifdef __WXMSW__
if (fPrintToDebugger) if (fPrintToDebugger)
{ {
// accumulate a line at a time // accumulate a line at a time
static CCriticalSection cs_OutputDebugStringF;
CRITICAL_BLOCK(cs_OutputDebugStringF) CRITICAL_BLOCK(cs_OutputDebugStringF)
{ {
static char pszBuffer[50000]; static char pszBuffer[50000];