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

Use short ptr for Vector data.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-11-02 15:39:52 +01:00
parent ea23d2b91a
commit 181d16459c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/TracyVector.hpp
View File

@ -10,6 +10,7 @@
#include "../common/TracyForceInline.hpp" #include "../common/TracyForceInline.hpp"
#include "TracyMemory.hpp" #include "TracyMemory.hpp"
#include "TracyPopcnt.hpp" #include "TracyPopcnt.hpp"
#include "TracyShortPtr.hpp"
#include "TracySlab.hpp" #include "TracySlab.hpp"
namespace tracy namespace tracy
@ -51,14 +52,14 @@ public:
if( m_capacity != std::numeric_limits<uint8_t>::max() ) if( m_capacity != std::numeric_limits<uint8_t>::max() )
{ {
memUsage.fetch_sub( Capacity() * sizeof( T ), std::memory_order_relaxed ); memUsage.fetch_sub( Capacity() * sizeof( T ), std::memory_order_relaxed );
delete[] m_ptr; delete[] (T*)m_ptr;
} }
} }
Vector& operator=( const Vector& ) = delete; Vector& operator=( const Vector& ) = delete;
tracy_force_inline Vector& operator=( Vector&& src ) noexcept tracy_force_inline Vector& operator=( Vector&& src ) noexcept
{ {
delete[] m_ptr; delete[] (T*)m_ptr;
memcpy( this, &src, sizeof( Vector<T> ) ); memcpy( this, &src, sizeof( Vector<T> ) );
memset( &src, 0, sizeof( Vector<T> ) ); memset( &src, 0, sizeof( Vector<T> ) );
return *this; return *this;
@ -289,7 +290,7 @@ private:
ptr[i] = std::move( m_ptr[i] ); ptr[i] = std::move( m_ptr[i] );
} }
} }
delete[] m_ptr; delete[] (T*)m_ptr;
} }
m_ptr = ptr; m_ptr = ptr;
} }
@ -304,12 +305,14 @@ private:
return 1 << m_capacity; return 1 << m_capacity;
} }
T* m_ptr; short_ptr<T> m_ptr;
uint32_t m_size; uint32_t m_size;
uint8_t m_capacity; uint8_t m_capacity;
}; };
#pragma pack() #pragma pack()
enum { VectorSize = sizeof( Vector<int> ) };
} }
#endif #endif