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

No need to store two same pointers.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-08-15 13:40:36 +02:00
parent 28aae73f74
commit 518ce1e946
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/TracyRingBuffer.hpp
View File

@ -12,21 +12,21 @@ public:
assert( Size >= pageSize ); assert( Size >= pageSize );
assert( __builtin_popcount( Size ) == 1 ); assert( __builtin_popcount( Size ) == 1 );
m_mapSize = Size + pageSize; m_mapSize = Size + pageSize;
m_mapAddr = mmap( nullptr, m_mapSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 ); auto mapAddr = mmap( nullptr, m_mapSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 );
if( !m_mapAddr ) if( !mapAddr )
{ {
m_fd = 0; m_fd = 0;
close( fd ); close( fd );
return; return;
} }
m_metadata = (perf_event_mmap_page*)m_mapAddr; m_metadata = (perf_event_mmap_page*)mapAddr;
assert( m_metadata->data_offset == pageSize ); assert( m_metadata->data_offset == pageSize );
m_buffer = ((char*)m_mapAddr) + pageSize; m_buffer = ((char*)mapAddr) + pageSize;
} }
~RingBuffer() ~RingBuffer()
{ {
if( m_mapAddr ) munmap( m_mapAddr, m_mapSize ); if( m_metadata ) munmap( m_metadata, m_mapSize );
if( m_fd ) close( m_fd ); if( m_fd ) close( m_fd );
} }
@ -36,19 +36,19 @@ public:
RingBuffer( RingBuffer&& other ) RingBuffer( RingBuffer&& other )
{ {
memcpy( (char*)&other, (char*)this, sizeof( RingBuffer ) ); memcpy( (char*)&other, (char*)this, sizeof( RingBuffer ) );
m_mapAddr = nullptr; m_metadata = nullptr;
m_fd = 0; m_fd = 0;
} }
RingBuffer& operator=( RingBuffer&& other ) RingBuffer& operator=( RingBuffer&& other )
{ {
memcpy( (char*)&other, (char*)this, sizeof( RingBuffer ) ); memcpy( (char*)&other, (char*)this, sizeof( RingBuffer ) );
m_mapAddr = nullptr; m_metadata = nullptr;
m_fd = 0; m_fd = 0;
return *this; return *this;
} }
bool IsValid() const { return m_mapAddr != nullptr; } bool IsValid() const { return m_metadata != nullptr; }
void Enable() void Enable()
{ {
@ -106,12 +106,10 @@ private:
std::atomic_store_explicit( (volatile std::atomic<uint64_t>*)&m_metadata->data_tail, tail, std::memory_order_release ); std::atomic_store_explicit( (volatile std::atomic<uint64_t>*)&m_metadata->data_tail, tail, std::memory_order_release );
} }
size_t m_mapSize;
void* m_mapAddr;
perf_event_mmap_page* m_metadata; perf_event_mmap_page* m_metadata;
char* m_buffer; char* m_buffer;
size_t m_mapSize;
int m_fd; int m_fd;
}; };