mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-30 20:53:52 +00:00
Code Issues Releases Wiki Activity

Don't mark FastVector element as used until it's ready.

Browse Source 
This should prevent a race condition that would result in invalid last
element of the queue, in case a freezed thread already got the queue
item, but didn't wrote to it (or didn't wrote fully).
This commit is contained in:
Bartosz Taudul 2018-08-20 22:35:50 +02:00
parent 8c0ff67796
commit facb05f8cb
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/TracyFastVector.hpp
View File

@ -60,6 +60,17 @@ public:
return m_write++; return m_write++;
} }
T* prepare_next()
{
if( m_write == m_end ) AllocMore();
return m_write;
}
void commit_next()
{
m_write++;
}
void clear() void clear()
{ {
m_write = m_ptr; m_write = m_ptr;

9
client/TracyProfiler.hpp
View File

@ -381,9 +381,10 @@ private:
static tracy_force_inline void SendCallstackMemory( void* ptr ) static tracy_force_inline void SendCallstackMemory( void* ptr )
{ {
#ifdef TRACY_HAS_CALLSTACK #ifdef TRACY_HAS_CALLSTACK
auto item = s_profiler.m_serialQueue.push_next(); auto item = s_profiler.m_serialQueue.prepare_next();
MemWrite( &item->hdr.type, QueueType::CallstackMemory ); MemWrite( &item->hdr.type, QueueType::CallstackMemory );
MemWrite( &item->callstackMemory.ptr, (uint64_t)ptr ); MemWrite( &item->callstackMemory.ptr, (uint64_t)ptr );
s_profiler.m_serialQueue.commit_next();
#endif #endif
} }
@ -391,7 +392,7 @@ private:
{ {
assert( type == QueueType::MemAlloc || type == QueueType::MemAllocCallstack ); assert( type == QueueType::MemAlloc || type == QueueType::MemAllocCallstack );
auto item = s_profiler.m_serialQueue.push_next(); auto item = s_profiler.m_serialQueue.prepare_next();
MemWrite( &item->hdr.type, type ); MemWrite( &item->hdr.type, type );
MemWrite( &item->memAlloc.time, GetTime() ); MemWrite( &item->memAlloc.time, GetTime() );
MemWrite( &item->memAlloc.thread, thread ); MemWrite( &item->memAlloc.thread, thread );
@ -406,17 +407,19 @@ private:
assert( sizeof( size ) == 8 ); assert( sizeof( size ) == 8 );
memcpy( &item->memAlloc.size, &size, 6 ); memcpy( &item->memAlloc.size, &size, 6 );
} }
s_profiler.m_serialQueue.commit_next();
} }
static tracy_force_inline void SendMemFree( QueueType type, const uint64_t thread, const void* ptr ) static tracy_force_inline void SendMemFree( QueueType type, const uint64_t thread, const void* ptr )
{ {
assert( type == QueueType::MemFree || type == QueueType::MemFreeCallstack ); assert( type == QueueType::MemFree || type == QueueType::MemFreeCallstack );
auto item = s_profiler.m_serialQueue.push_next(); auto item = s_profiler.m_serialQueue.prepare_next();
MemWrite( &item->hdr.type, type ); MemWrite( &item->hdr.type, type );
MemWrite( &item->memFree.time, GetTime() ); MemWrite( &item->memFree.time, GetTime() );
MemWrite( &item->memFree.thread, thread ); MemWrite( &item->memFree.thread, thread );
MemWrite( &item->memFree.ptr, (uint64_t)ptr ); MemWrite( &item->memFree.ptr, (uint64_t)ptr );
s_profiler.m_serialQueue.commit_next();
} }
double m_timerMul; double m_timerMul;