Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/wolfpld/tracy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Taudul <wolf.pld@gmail.com>2019-05-28 20:21:53 +0300
committerBartosz Taudul <wolf.pld@gmail.com>2019-05-28 20:21:53 +0300
commit845f3a2ddf003076216120b67d32b13452d1d5fe (patch)
tree9dfe23fb2e96c0add04c42674dcec8a3f7b90e90 /server/TracyWorker.hpp
parent145ca30df96c61a69834a0b5de8daab016739ae0 (diff)
Use std::shared_mutex for locking worker access.
Diffstat (limited to 'server/TracyWorker.hpp')
-rw-r--r--server/TracyWorker.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp
index 9832ed42..53004f8e 100644
--- a/server/TracyWorker.hpp
+++ b/server/TracyWorker.hpp
@@ -3,6 +3,7 @@
#include <atomic>
#include <limits>
+#include <shared_mutex>
#include <stdexcept>
#include <string>
#include <thread>
@@ -10,7 +11,6 @@
#include "../common/tracy_lz4.hpp"
#include "../common/TracyForceInline.hpp"
-#include "../common/TracyMutex.hpp"
#include "../common/TracyQueue.hpp"
#include "../common/TracyProtocol.hpp"
#include "../common/TracySocket.hpp"
@@ -137,7 +137,7 @@ private:
{
DataBlock() : zonesCnt( 0 ), lastTime( 0 ), frameOffset( 0 ), threadLast( std::numeric_limits<uint64_t>::max(), 0 ) {}
- TracyMutex lock;
+ std::shared_mutex lock;
StringDiscovery<FrameData*> frames;
FrameData* framesBase;
Vector<GpuCtxData*> gpuData;
@@ -188,7 +188,7 @@ private:
{
MbpsBlock() : mbps( 64 ), compRatio( 1.0 ), queue( 0 ) {}
- TracyMutex lock;
+ std::shared_mutex lock;
std::vector<float> mbps;
float compRatio;
size_t queue;
@@ -243,7 +243,7 @@ public:
int64_t GetDelay() const { return m_delay; }
int64_t GetResolution() const { return m_resolution; }
- TracyMutex& GetDataLock() { return m_data.lock; }
+ std::shared_mutex& GetDataLock() { return m_data.lock; }
size_t GetFrameCount( const FrameData& fd ) const { return fd.frames.size(); }
size_t GetFullFrameCount( const FrameData& fd ) const;
int64_t GetTimeBegin() const { return GetFrameBegin( *m_data.framesBase, 0 ); }
@@ -315,7 +315,7 @@ public:
}
tracy_force_inline uint64_t DecompressThread( uint16_t thread ) const { assert( thread < m_data.threadExpand.size() ); return m_data.threadExpand[thread]; }
- TracyMutex& GetMbpsDataLock() { return m_mbpsData.lock; }
+ std::shared_mutex& GetMbpsDataLock() { return m_mbpsData.lock; }
const std::vector<float>& GetMbpsData() const { return m_mbpsData.mbps; }
float GetCompRatio() const { return m_mbpsData.compRatio; }
size_t GetSendQueueSize() const { return m_mbpsData.queue; }