zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Merge remote-tracking branch 'origin/master' into hw

Browse Source
This commit is contained in:
Bartosz Taudul
2021-05-22 02:05:47 +02:00
parent 8ec08465ee 68948712b4
commit fef507dfa2
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/TracyCallstack.cpp
+3 -3
View File
@@ -292,7 +292,7 @@ CallstackSymbolData DecodeCodeAddress( uint64_t ptr )
#ifdef TRACY_DBGHELP_LOCK
DBGHELP_LOCK;
#endif
#ifndef __CYGWIN__
#if !defined __CYGWIN__ && !defined TRACY_NO_CALLSTACK_INLINES
DWORD inlineNum = SymAddrIncludeInlineTrace( proc, ptr );
DWORD ctx = 0;
DWORD idx;
@@ -335,7 +335,7 @@ CallstackEntryData DecodeCallstackPtr( uint64_t ptr )
#ifdef TRACY_DBGHELP_LOCK
DBGHELP_LOCK;
#endif
#ifndef __CYGWIN__
#if !defined __CYGWIN__ && !defined TRACY_NO_CALLSTACK_INLINES
DWORD inlineNum = SymAddrIncludeInlineTrace( proc, ptr );
if( inlineNum > MaxCbTrace - 1 ) inlineNum = MaxCbTrace - 1;
DWORD ctx = 0;
@@ -393,7 +393,7 @@ CallstackEntryData DecodeCallstackPtr( uint64_t ptr )
}
}
#ifndef __CYGWIN__
#if !defined __CYGWIN__ && !defined TRACY_NO_CALLSTACK_INLINES
if( doInline )
{
for( DWORD i=0; i<inlineNum; i++ )
client/TracyProfiler.cpp
+4 -2
View File
@@ -1676,7 +1676,7 @@ void Profiler::Worker()
keepAlive = 0;
}
else
else if( !m_sock->HasData() )
{
keepAlive++;
std::this_thread::sleep_for( std::chrono::milliseconds( 10 ) );
@@ -1687,10 +1687,12 @@ void Profiler::Worker()
keepAlive = 0;
}
int quota = 500;
bool connActive = true;
while( m_sock->HasData() && connActive )
while( quota-- && m_sock->HasData() )
{
connActive = HandleServerQuery();
if( !connActive ) break;
}
if( !connActive ) break;
}