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

Rename CallstackMemory to CallstackSerial.

Browse Source
This commit is contained in:
Bartosz Taudul
2021-01-15 20:49:39 +01:00
parent c66b2cb536
commit d4c0d4fbb7
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyWorker.cpp
+18 -18
View File
@@ -4260,8 +4260,8 @@ bool Worker::Process( const QueueItem& ev )
case QueueType::MemFreeCallstackNamed:
ProcessMemFreeCallstackNamed( ev.memFree );
break;
case QueueType::CallstackMemory:
ProcessCallstackMemory();
case QueueType::CallstackSerial:
ProcessCallstackSerial();
break;
case QueueType::Callstack:
case QueueType::CallstackAlloc:
@@ -4549,7 +4549,7 @@ void Worker::MemFreeFailure( uint64_t thread )
{
m_failure = Failure::MemFree;
m_failureData.thread = thread;
m_failureData.callstack = m_memNextCallstack;
m_failureData.callstack = m_serialNextCallstack;
}
void Worker::FrameEndFailure()
@@ -5525,9 +5525,9 @@ void Worker::ProcessMemAllocCallstack( const QueueMemAlloc& ev )
{
auto mem = ProcessMemAlloc( ev );
assert( mem );
assert( m_memNextCallstack != 0 );
mem->SetCsAlloc( m_memNextCallstack );
m_memNextCallstack = 0;
assert( m_serialNextCallstack != 0 );
mem->SetCsAlloc( m_serialNextCallstack );
m_serialNextCallstack = 0;
}
void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev )
@@ -5544,17 +5544,17 @@ void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev )
}
auto mem = ProcessMemAllocImpl( memname, *it->second, ev );
assert( mem );
assert( m_memNextCallstack != 0 );
mem->SetCsAlloc( m_memNextCallstack );
m_memNextCallstack = 0;
assert( m_serialNextCallstack != 0 );
mem->SetCsAlloc( m_serialNextCallstack );
m_serialNextCallstack = 0;
}
void Worker::ProcessMemFreeCallstack( const QueueMemFree& ev )
{
auto mem = ProcessMemFree( ev );
assert( m_memNextCallstack != 0 );
if( mem ) mem->csFree.SetVal( m_memNextCallstack );
m_memNextCallstack = 0;
assert( m_serialNextCallstack != 0 );
if( mem ) mem->csFree.SetVal( m_serialNextCallstack );
m_serialNextCallstack = 0;
}
void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev )
@@ -5570,16 +5570,16 @@ void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev )
it->second->name = memname;
}
auto mem = ProcessMemFreeImpl( memname, *it->second, ev );
assert( m_memNextCallstack != 0 );
if( mem ) mem->csFree.SetVal( m_memNextCallstack );
m_memNextCallstack = 0;
assert( m_serialNextCallstack != 0 );
if( mem ) mem->csFree.SetVal( m_serialNextCallstack );
m_serialNextCallstack = 0;
}
void Worker::ProcessCallstackMemory()
void Worker::ProcessCallstackSerial()
{
assert( m_pendingCallstackId != 0 );
assert( m_memNextCallstack == 0 );
m_memNextCallstack = m_pendingCallstackId;
assert( m_serialNextCallstack == 0 );
m_serialNextCallstack = m_pendingCallstackId;
m_pendingCallstackId = 0;
}
server/TracyWorker.hpp
+2 -2
View File
@@ -648,7 +648,7 @@ private:
tracy_force_inline void ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev );
tracy_force_inline void ProcessMemFreeCallstack( const QueueMemFree& ev );
tracy_force_inline void ProcessMemFreeCallstackNamed( const QueueMemFree& ev );
tracy_force_inline void ProcessCallstackMemory();
tracy_force_inline void ProcessCallstackSerial();
tracy_force_inline void ProcessCallstack();
tracy_force_inline void ProcessCallstackSample( const QueueCallstackSample& ev );
tracy_force_inline void ProcessCallstackFrameSize( const QueueCallstackFrameSize& ev );
@@ -880,7 +880,7 @@ private:
uint64_t m_callstackAllocNextIdx = 0;
uint64_t m_callstackParentNextIdx = 0;
uint32_t m_memNextCallstack = 0;
uint32_t m_serialNextCallstack = 0;
uint64_t m_memNamePayload = 0;
Slab<64*1024*1024> m_slab;