mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-03 14:03:52 +00:00
Code Issues Releases Wiki Activity

Don't hold lock on serial queue during dequeue.

Browse Source
This commit is contained in:
Bartosz Taudul 2018-04-14 15:46:11 +02:00
parent e1dc62cabe
commit 459890ef0e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
client/TracyProfiler.cpp
View File

@ -127,6 +127,7 @@ Profiler::Profiler()
, m_itemBuf( (QueueItem*)tracy_malloc( sizeof( QueueItem ) * BulkSize ) ) , m_itemBuf( (QueueItem*)tracy_malloc( sizeof( QueueItem ) * BulkSize ) )
, m_lz4Buf( (char*)tracy_malloc( LZ4Size + sizeof( lz4sz_t ) ) ) , m_lz4Buf( (char*)tracy_malloc( LZ4Size + sizeof( lz4sz_t ) ) )
, m_serialQueue( 1024*1024 ) , m_serialQueue( 1024*1024 )
, m_serialDequeue( 1024*1024 )
{ {
assert( !s_instance ); assert( !s_instance );
s_instance = this; s_instance = this;
@ -332,11 +333,15 @@ Profiler::DequeueStatus Profiler::Dequeue( moodycamel::ConsumerToken& token )
Profiler::DequeueStatus Profiler::DequeueSerial() Profiler::DequeueStatus Profiler::DequeueSerial()
{ {
std::lock_guard<NonRecursiveBenaphore> lock( m_serialLock ); {
const auto sz = m_serialQueue.size(); std::lock_guard<NonRecursiveBenaphore> lock( m_serialLock );
m_serialQueue.swap( m_serialDequeue );
}
const auto sz = m_serialDequeue.size();
if( sz > 0 ) if( sz > 0 )
{ {
auto item = m_serialQueue.data(); auto item = m_serialDequeue.data();
auto end = item + sz; auto end = item + sz;
while( item != end ) while( item != end )
{ {
@ -344,7 +349,7 @@ Profiler::DequeueStatus Profiler::DequeueSerial()
if( !AppendData( item, QueueDataSize[idx] ) ) return ConnectionLost; if( !AppendData( item, QueueDataSize[idx] ) ) return ConnectionLost;
item++; item++;
} }
m_serialQueue.clear(); m_serialDequeue.clear();
} }
else else
{ {

2
client/TracyProfiler.hpp
View File

@ -259,7 +259,7 @@ private:
QueueItem* m_itemBuf; QueueItem* m_itemBuf;
char* m_lz4Buf; char* m_lz4Buf;
FastVector<QueueItem> m_serialQueue; FastVector<QueueItem> m_serialQueue, m_serialDequeue;
NonRecursiveBenaphore m_serialLock; NonRecursiveBenaphore m_serialLock;
}; };