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

Hide implementation details wrt concurrent queue.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-09-18 18:51:45 +02:00
parent 2f7fa20e34
commit 9d2fef2f11
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/TracyProfiler.cpp
View File

@ -11,6 +11,7 @@
#include "../common/TracyProtocol.hpp" #include "../common/TracyProtocol.hpp"
#include "../common/TracySocket.hpp" #include "../common/TracySocket.hpp"
#include "../common/TracySystem.hpp" #include "../common/TracySystem.hpp"
#include "concurrentqueue.h"
#include "TracyProfiler.hpp" #include "TracyProfiler.hpp"
#ifdef _DEBUG #ifdef _DEBUG
@ -20,10 +21,17 @@
namespace tracy namespace tracy
{ {
static moodycamel::ConcurrentQueue<QueueItem> s_queue;
static moodycamel::ProducerToken& GetToken()
{
static thread_local moodycamel::ProducerToken token( s_queue );
return token;
}
extern const char* PointerCheckA; extern const char* PointerCheckA;
const char* PointerCheckB = "tracy"; const char* PointerCheckB = "tracy";
static Profiler* s_instance = nullptr; static Profiler* s_instance = nullptr;
Profiler::Profiler() Profiler::Profiler()
@ -66,7 +74,7 @@ uint64_t Profiler::ZoneBegin( QueueZoneBegin&& data )
item.hdr.type = QueueType::ZoneBegin; item.hdr.type = QueueType::ZoneBegin;
item.hdr.id = id; item.hdr.id = id;
item.zoneBegin = std::move( data ); item.zoneBegin = std::move( data );
s_instance->m_queue.enqueue( GetToken(), std::move( item ) ); s_queue.enqueue( GetToken(), std::move( item ) );
return id; return id;
} }
@ -76,7 +84,7 @@ void Profiler::ZoneEnd( uint64_t id, QueueZoneEnd&& data )
item.hdr.type = QueueType::ZoneEnd; item.hdr.type = QueueType::ZoneEnd;
item.hdr.id = id; item.hdr.id = id;
item.zoneEnd = std::move( data ); item.zoneEnd = std::move( data );
s_instance->m_queue.enqueue( GetToken(), std::move( item ) ); s_queue.enqueue( GetToken(), std::move( item ) );
} }
void Profiler::FrameMark() void Profiler::FrameMark()
@ -84,12 +92,7 @@ void Profiler::FrameMark()
QueueItem item; QueueItem item;
item.hdr.type = QueueType::FrameMark; item.hdr.type = QueueType::FrameMark;
item.hdr.id = (uint64_t)GetTime(); item.hdr.id = (uint64_t)GetTime();
s_instance->m_queue.enqueue( GetToken(), std::move( item ) ); s_queue.enqueue( GetToken(), std::move( item ) );
}
Profiler* Profiler::Instance()
{
return s_instance;
} }
bool Profiler::ShouldExit() bool Profiler::ShouldExit()
@ -105,7 +108,7 @@ void Profiler::Worker()
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 10000; tv.tv_usec = 10000;
moodycamel::ConsumerToken token( m_queue ); moodycamel::ConsumerToken token( s_queue );
ListenSocket listen; ListenSocket listen;
listen.Listen( "8086", 8 ); listen.Listen( "8086", 8 );
@ -136,7 +139,7 @@ void Profiler::Worker()
if( m_shutdown.load( std::memory_order_relaxed ) ) return; if( m_shutdown.load( std::memory_order_relaxed ) ) return;
QueueItem item[BulkSize]; QueueItem item[BulkSize];
const auto sz = m_queue.try_dequeue_bulk( token, item, BulkSize ); const auto sz = s_queue.try_dequeue_bulk( token, item, BulkSize );
if( sz > 0 ) if( sz > 0 )
{ {
auto buf = m_buffer + m_bufferOffset; auto buf = m_buffer + m_bufferOffset;

9
client/TracyProfiler.hpp
View File

@ -6,7 +6,6 @@
#include <stdint.h> #include <stdint.h>
#include <thread> #include <thread>
#include "concurrentqueue.h"
#include "../common/tracy_lz4.hpp" #include "../common/tracy_lz4.hpp"
#include "../common/TracyQueue.hpp" #include "../common/TracyQueue.hpp"
@ -40,17 +39,9 @@ private:
bool SendData( const char* data, size_t len ); bool SendData( const char* data, size_t len );
bool SendString( uint64_t ptr ); bool SendString( uint64_t ptr );
static Profiler* Instance();
static moodycamel::ProducerToken& GetToken()
{
static thread_local moodycamel::ProducerToken token( Instance()->m_queue );
return token;
}
int64_t m_timeBegin; int64_t m_timeBegin;
std::thread m_thread; std::thread m_thread;
std::atomic<bool> m_shutdown; std::atomic<bool> m_shutdown;
moodycamel::ConcurrentQueue<QueueItem> m_queue;
std::atomic<uint64_t> m_id; std::atomic<uint64_t> m_id;
std::unique_ptr<Socket> m_sock; std::unique_ptr<Socket> m_sock;