mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 12:23:53 +00:00
Code Issues Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/TracyProfiler.cpp
View File

@ -1778,7 +1778,7 @@ static void FreeAssociatedMemory( const QueueItem& item )
ptr = MemRead<uint64_t>( &item.gpuZoneBegin.srcloc ); ptr = MemRead<uint64_t>( &item.gpuZoneBegin.srcloc );
tracy_free( (void*)ptr ); tracy_free( (void*)ptr );
break; break;
case QueueType::CallstackMemory: case QueueType::CallstackSerial:
case QueueType::Callstack: case QueueType::Callstack:
ptr = MemRead<uint64_t>( &item.callstackFat.ptr ); ptr = MemRead<uint64_t>( &item.callstackFat.ptr );
tracy_free( (void*)ptr ); tracy_free( (void*)ptr );
@ -2152,7 +2152,7 @@ Profiler::DequeueStatus Profiler::DequeueSerial()
{ {
switch( (QueueType)idx ) switch( (QueueType)idx )
{ {
case QueueType::CallstackMemory: case QueueType::CallstackSerial:
ptr = MemRead<uint64_t>( &item->callstackFat.ptr ); ptr = MemRead<uint64_t>( &item->callstackFat.ptr );
SendCallstackPayload( ptr ); SendCallstackPayload( ptr );
tracy_free( (void*)ptr ); tracy_free( (void*)ptr );

12
client/TracyProfiler.hpp
View File

@ -401,7 +401,7 @@ public:
auto callstack = Callstack( depth ); auto callstack = Callstack( depth );
profiler.m_serialLock.lock(); profiler.m_serialLock.lock();
SendCallstackMemory( callstack ); SendCallstackSerial( callstack );
SendMemAlloc( QueueType::MemAllocCallstack, thread, ptr, size ); SendMemAlloc( QueueType::MemAllocCallstack, thread, ptr, size );
profiler.m_serialLock.unlock(); profiler.m_serialLock.unlock();
#else #else
@ -423,7 +423,7 @@ public:
auto callstack = Callstack( depth ); auto callstack = Callstack( depth );
profiler.m_serialLock.lock(); profiler.m_serialLock.lock();
SendCallstackMemory( callstack ); SendCallstackSerial( callstack );
SendMemFree( QueueType::MemFreeCallstack, thread, ptr ); SendMemFree( QueueType::MemFreeCallstack, thread, ptr );
profiler.m_serialLock.unlock(); profiler.m_serialLock.unlock();
#else #else
@ -473,7 +473,7 @@ public:
auto callstack = Callstack( depth ); auto callstack = Callstack( depth );
profiler.m_serialLock.lock(); profiler.m_serialLock.lock();
SendCallstackMemory( callstack ); SendCallstackSerial( callstack );
SendMemName( name ); SendMemName( name );
SendMemAlloc( QueueType::MemAllocCallstackNamed, thread, ptr, size ); SendMemAlloc( QueueType::MemAllocCallstackNamed, thread, ptr, size );
profiler.m_serialLock.unlock(); profiler.m_serialLock.unlock();
@ -496,7 +496,7 @@ public:
auto callstack = Callstack( depth ); auto callstack = Callstack( depth );
profiler.m_serialLock.lock(); profiler.m_serialLock.lock();
SendCallstackMemory( callstack ); SendCallstackSerial( callstack );
SendMemName( name ); SendMemName( name );
SendMemFree( QueueType::MemFreeCallstackNamed, thread, ptr ); SendMemFree( QueueType::MemFreeCallstackNamed, thread, ptr );
profiler.m_serialLock.unlock(); profiler.m_serialLock.unlock();
@ -672,11 +672,11 @@ private:
void CalibrateDelay(); void CalibrateDelay();
void ReportTopology(); void ReportTopology();
static tracy_force_inline void SendCallstackMemory( void* ptr ) static tracy_force_inline void SendCallstackSerial( void* ptr )
{ {
#ifdef TRACY_HAS_CALLSTACK #ifdef TRACY_HAS_CALLSTACK
auto item = GetProfiler().m_serialQueue.prepare_next(); auto item = GetProfiler().m_serialQueue.prepare_next();
MemWrite( &item->hdr.type, QueueType::CallstackMemory ); MemWrite( &item->hdr.type, QueueType::CallstackSerial );
MemWrite( &item->callstackFat.ptr, (uint64_t)ptr ); MemWrite( &item->callstackFat.ptr, (uint64_t)ptr );
GetProfiler().m_serialQueue.commit_next(); GetProfiler().m_serialQueue.commit_next();
#endif #endif

2
common/TracyQueue.hpp
View File

@ -17,7 +17,7 @@ enum class QueueType : uint8_t
MessageAppInfo, MessageAppInfo,
ZoneBeginAllocSrcLoc, ZoneBeginAllocSrcLoc,
ZoneBeginAllocSrcLocCallstack, ZoneBeginAllocSrcLocCallstack,
CallstackMemory, CallstackSerial,
Callstack, Callstack,
CallstackAlloc, CallstackAlloc,
CallstackSample, CallstackSample,

36
server/TracyWorker.cpp
View File

@ -4260,8 +4260,8 @@ bool Worker::Process( const QueueItem& ev )
case QueueType::MemFreeCallstackNamed: case QueueType::MemFreeCallstackNamed:
ProcessMemFreeCallstackNamed( ev.memFree ); ProcessMemFreeCallstackNamed( ev.memFree );
break; break;
case QueueType::CallstackMemory: case QueueType::CallstackSerial:
ProcessCallstackMemory(); ProcessCallstackSerial();
break; break;
case QueueType::Callstack: case QueueType::Callstack:
case QueueType::CallstackAlloc: case QueueType::CallstackAlloc:
@ -4549,7 +4549,7 @@ void Worker::MemFreeFailure( uint64_t thread )
{ {
m_failure = Failure::MemFree; m_failure = Failure::MemFree;
m_failureData.thread = thread; m_failureData.thread = thread;
m_failureData.callstack = m_memNextCallstack; m_failureData.callstack = m_serialNextCallstack;
} }
void Worker::FrameEndFailure() void Worker::FrameEndFailure()
@ -5525,9 +5525,9 @@ void Worker::ProcessMemAllocCallstack( const QueueMemAlloc& ev )
{ {
auto mem = ProcessMemAlloc( ev ); auto mem = ProcessMemAlloc( ev );
assert( mem ); assert( mem );
assert( m_memNextCallstack != 0 ); assert( m_serialNextCallstack != 0 );
mem->SetCsAlloc( m_memNextCallstack ); mem->SetCsAlloc( m_serialNextCallstack );
m_memNextCallstack = 0; m_serialNextCallstack = 0;
} }
void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev ) void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev )
@ -5544,17 +5544,17 @@ void Worker::ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev )
} }
auto mem = ProcessMemAllocImpl( memname, *it->second, ev ); auto mem = ProcessMemAllocImpl( memname, *it->second, ev );
assert( mem ); assert( mem );
assert( m_memNextCallstack != 0 ); assert( m_serialNextCallstack != 0 );
mem->SetCsAlloc( m_memNextCallstack ); mem->SetCsAlloc( m_serialNextCallstack );
m_memNextCallstack = 0; m_serialNextCallstack = 0;
} }
void Worker::ProcessMemFreeCallstack( const QueueMemFree& ev ) void Worker::ProcessMemFreeCallstack( const QueueMemFree& ev )
{ {
auto mem = ProcessMemFree( ev ); auto mem = ProcessMemFree( ev );
assert( m_memNextCallstack != 0 ); assert( m_serialNextCallstack != 0 );
if( mem ) mem->csFree.SetVal( m_memNextCallstack ); if( mem ) mem->csFree.SetVal( m_serialNextCallstack );
m_memNextCallstack = 0; m_serialNextCallstack = 0;
} }
void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev ) void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev )
@ -5570,16 +5570,16 @@ void Worker::ProcessMemFreeCallstackNamed( const QueueMemFree& ev )
it->second->name = memname; it->second->name = memname;
} }
auto mem = ProcessMemFreeImpl( memname, *it->second, ev ); auto mem = ProcessMemFreeImpl( memname, *it->second, ev );
assert( m_memNextCallstack != 0 ); assert( m_serialNextCallstack != 0 );
if( mem ) mem->csFree.SetVal( m_memNextCallstack ); if( mem ) mem->csFree.SetVal( m_serialNextCallstack );
m_memNextCallstack = 0; m_serialNextCallstack = 0;
} }
void Worker::ProcessCallstackMemory() void Worker::ProcessCallstackSerial()
{ {
assert( m_pendingCallstackId != 0 ); assert( m_pendingCallstackId != 0 );
assert( m_memNextCallstack == 0 ); assert( m_serialNextCallstack == 0 );
m_memNextCallstack = m_pendingCallstackId; m_serialNextCallstack = m_pendingCallstackId;
m_pendingCallstackId = 0; m_pendingCallstackId = 0;
} }

4
server/TracyWorker.hpp
View File

@ -648,7 +648,7 @@ private:
tracy_force_inline void ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev ); tracy_force_inline void ProcessMemAllocCallstackNamed( const QueueMemAlloc& ev );
tracy_force_inline void ProcessMemFreeCallstack( const QueueMemFree& ev ); tracy_force_inline void ProcessMemFreeCallstack( const QueueMemFree& ev );
tracy_force_inline void ProcessMemFreeCallstackNamed( 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 ProcessCallstack();
tracy_force_inline void ProcessCallstackSample( const QueueCallstackSample& ev ); tracy_force_inline void ProcessCallstackSample( const QueueCallstackSample& ev );
tracy_force_inline void ProcessCallstackFrameSize( const QueueCallstackFrameSize& ev ); tracy_force_inline void ProcessCallstackFrameSize( const QueueCallstackFrameSize& ev );
@ -880,7 +880,7 @@ private:
uint64_t m_callstackAllocNextIdx = 0; uint64_t m_callstackAllocNextIdx = 0;
uint64_t m_callstackParentNextIdx = 0; uint64_t m_callstackParentNextIdx = 0;
uint32_t m_memNextCallstack = 0; uint32_t m_serialNextCallstack = 0;
uint64_t m_memNamePayload = 0; uint64_t m_memNamePayload = 0;
Slab<64*1024*1024> m_slab; Slab<64*1024*1024> m_slab;