mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 20:42:59 +01:00
Merge remote branch 'refs/remotes/svn/trunk' into svn
This commit is contained in:
commit
11c570cfb4
11
util.cpp
11
util.cpp
@ -158,17 +158,14 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
|
|||||||
{
|
{
|
||||||
// print to debug.log
|
// print to debug.log
|
||||||
static FILE* fileout = NULL;
|
static FILE* fileout = NULL;
|
||||||
static int64 nOpenTime = 0;
|
|
||||||
|
|
||||||
if (GetTime()-nOpenTime > 10 * 60)
|
if (!fileout)
|
||||||
{
|
{
|
||||||
if (fileout)
|
|
||||||
fclose(fileout);
|
|
||||||
char pszFile[MAX_PATH+100];
|
char pszFile[MAX_PATH+100];
|
||||||
GetDataDir(pszFile);
|
GetDataDir(pszFile);
|
||||||
strlcat(pszFile, "/debug.log", sizeof(pszFile));
|
strlcat(pszFile, "/debug.log", sizeof(pszFile));
|
||||||
fileout = fopen(pszFile, "a");
|
fileout = fopen(pszFile, "a");
|
||||||
nOpenTime = GetTime();
|
setbuf(fileout, NULL); // unbuffered
|
||||||
}
|
}
|
||||||
if (fileout)
|
if (fileout)
|
||||||
{
|
{
|
||||||
@ -178,15 +175,15 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
|
|||||||
va_start(arg_ptr, pszFormat);
|
va_start(arg_ptr, pszFormat);
|
||||||
ret = vfprintf(fileout, pszFormat, arg_ptr);
|
ret = vfprintf(fileout, pszFormat, arg_ptr);
|
||||||
va_end(arg_ptr);
|
va_end(arg_ptr);
|
||||||
fflush(fileout);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
if (fPrintToDebugger)
|
if (fPrintToDebugger)
|
||||||
{
|
{
|
||||||
// accumulate a line at a time
|
|
||||||
static CCriticalSection cs_OutputDebugStringF;
|
static CCriticalSection cs_OutputDebugStringF;
|
||||||
|
|
||||||
|
// accumulate a line at a time
|
||||||
CRITICAL_BLOCK(cs_OutputDebugStringF)
|
CRITICAL_BLOCK(cs_OutputDebugStringF)
|
||||||
{
|
{
|
||||||
static char pszBuffer[50000];
|
static char pszBuffer[50000];
|
||||||
|
Loading…
Reference in New Issue
Block a user