mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 10:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let's not worry about lock memory reuse.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-10-04 16:51:51 +02:00
parent 0011573fa9
commit 8c90eab044
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/TracyLock.hpp
View File

@ -1,23 +1,28 @@
#ifndef __TRACYLOCK_HPP__
#define __TRACYLOCK_HPP__
#include <atomic>
#include "../common/TracySystem.hpp"
#include "TracyProfiler.hpp"
namespace tracy
{
static std::atomic<uint64_t> s_lockCounter( 0 );
template<class T>
class Lockable
{
public:
Lockable( const SourceLocation* srcloc )
: m_id( s_lockCounter.fetch_add( 1, std::memory_order_relaxed ) )
{
Magic magic;
auto& token = s_token;
auto item = s_queue.enqueue_begin( token, magic );
item->hdr.type = QueueType::LockAnnounce;
item->lockAnnounce.id = (uint64_t)&m_lockable;
item->lockAnnounce.id = m_id;
item->lockAnnounce.srcloc = (uint64_t)srcloc;
s_queue.enqueue_finish( token, magic );
}
@ -34,7 +39,7 @@ public:
auto& token = s_token;
auto item = s_queue.enqueue_begin( token, magic );
item->hdr.type = QueueType::LockWait;
item->lockWait.id = (uint64_t)&m_lockable;
item->lockWait.id = m_id;
item->lockWait.thread = thread;
item->lockWait.time = Profiler::GetTime( item->zoneBegin.cpu );
s_queue.enqueue_finish( token, magic );
@ -47,7 +52,7 @@ public:
auto& token = s_token;
auto item = s_queue.enqueue_begin( token, magic );
item->hdr.type = QueueType::LockObtain;
item->lockObtain.id = (uint64_t)&m_lockable;
item->lockObtain.id = m_id;
item->lockObtain.thread = thread;
item->lockObtain.time = Profiler::GetTime( item->zoneBegin.cpu );
s_queue.enqueue_finish( token, magic );
@ -63,7 +68,7 @@ public:
auto& token = s_token;
auto item = s_queue.enqueue_begin( token, magic );
item->hdr.type = QueueType::LockRelease;
item->lockRelease.id = (uint64_t)&m_lockable;
item->lockRelease.id = m_id;
item->lockRelease.thread = GetThreadHandle();
item->lockRelease.time = Profiler::GetTime( item->zoneBegin.cpu );
s_queue.enqueue_finish( token, magic );
@ -89,6 +94,7 @@ public:
private:
T m_lockable;
uint64_t m_id;
};
};

8
common/TracyQueue.hpp
View File

@ -74,27 +74,27 @@ struct QueueZoneName
struct QueueLockAnnounce
{
uint64_t id; // ptr
uint64_t id;
uint64_t srcloc; // ptr
};
struct QueueLockWait
{
uint64_t id; // ptr
uint64_t id;
int64_t time;
uint64_t thread;
};
struct QueueLockObtain
{
uint64_t id; // ptr
uint64_t id;
int64_t time;
uint64_t thread;
};
struct QueueLockRelease
{
uint64_t id; // ptr
uint64_t id;
int64_t time;
uint64_t thread;
};

11
server/TracyView.cpp
View File

@ -457,15 +457,8 @@ void View::ProcessLockAnnounce( const QueueLockAnnounce& ev )
auto ptr = m_slab.Alloc<LockEvent>();
ptr->srcloc = ev.srcloc;
auto it = m_lockMap.find( ev.id );
if( it == m_lockMap.end() )
{
m_lockMap.emplace( ev.id, ptr );
}
else
{
it->second = ptr;
}
assert( m_lockMap.find( ev.id ) == m_lockMap.end() );
m_lockMap.emplace( ev.id, ptr );
std::lock_guard<std::mutex> lock( m_lock );
m_locks.push_back( ptr );