mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-29 16:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

make a copy of dli_fname after calling dladdr. Call ImageCache destructor.

Browse Source
This commit is contained in:
trodrigues 2023-12-09 09:40:07 -06:00
parent 8503f32b36
commit 15f1b6b0b4
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
public/client/TracyCallstack.cpp
View File

@ -117,18 +117,27 @@ public:
ImageCache() ImageCache()
{ {
m_images = (tracy::FastVector<ImageEntry>*)tracy::tracy_malloc( sizeof( tracy::FastVector<ImageEntry> ) ); m_images = (FastVector<ImageEntry>*)tracy_malloc( sizeof( FastVector<ImageEntry> ) );
new(m_images) tracy::FastVector<ImageEntry>( 512 ); new(m_images) FastVector<ImageEntry>( 512 );
Refresh(); Refresh();
} }
~ImageCache()
{
m_images->~FastVector<ImageEntry>();
tracy_free( m_images );
tracy_free( m_imageName );
}
const ImageEntry* GetImageForAddress( void* address ) const ImageEntry* GetImageForAddress( void* address )
{ {
const ImageEntry* entry = GetImageEntryForAddress( address ); const ImageEntry* entry = GetImageForAddressImpl( address );
if( !entry ) if( !entry )
{ {
Refresh(); Refresh();
return GetImageEntryForAddress( address ); return GetImageForAddressImpl( address );
} }
return entry; return entry;
} }
@ -136,7 +145,7 @@ public:
private: private:
tracy::FastVector<ImageEntry>* m_images; tracy::FastVector<ImageEntry>* m_images;
const char* m_imageName = nullptr; char* m_imageName = nullptr;
static int Callback( struct dl_phdr_info* info, size_t size, void* data ) static int Callback( struct dl_phdr_info* info, size_t size, void* data )
{ {
@ -162,7 +171,9 @@ private:
Dl_info dlInfo; Dl_info dlInfo;
if( dladdr( (void *)info->dlpi_addr, &dlInfo ) ) if( dladdr( (void *)info->dlpi_addr, &dlInfo ) )
{ {
cache->m_imageName = dlInfo.dli_fname; size_t sz = strlen( dlInfo.dli_fname ) + 1;
cache->m_imageName = (char*)tracy_malloc( sz );
memcpy( (void*)cache->m_imageName, dlInfo.dli_fname, sz );
} }
} }
image->m_name = cache->m_imageName; image->m_name = cache->m_imageName;
@ -181,7 +192,7 @@ private:
[]( const ImageEntry& lhs, const ImageEntry& rhs ) { return lhs.m_startAddress > rhs.m_startAddress; } ); []( const ImageEntry& lhs, const ImageEntry& rhs ) { return lhs.m_startAddress > rhs.m_startAddress; } );
} }
const ImageEntry* GetImageEntryForAddress( void* address ) const const ImageEntry* GetImageForAddressImpl( void* address ) const
{ {
auto it = std::lower_bound( m_images->begin(), m_images->end(), address, auto it = std::lower_bound( m_images->begin(), m_images->end(), address,
[]( const ImageEntry& lhs, const void* rhs ) { return lhs.m_startAddress > rhs; } ); []( const ImageEntry& lhs, const void* rhs ) { return lhs.m_startAddress > rhs; } );
@ -887,7 +898,7 @@ void InitCallstack()
InitRpmalloc(); InitRpmalloc();
#ifdef TRACY_USE_IMAGE_CACHE #ifdef TRACY_USE_IMAGE_CACHE
s_imageCache = (ImageCache*)tracy::tracy_malloc( sizeof( ImageCache ) ); s_imageCache = (ImageCache*)tracy_malloc( sizeof( ImageCache ) );
new(s_imageCache) ImageCache(); new(s_imageCache) ImageCache();
#endif //#ifdef TRACY_USE_IMAGE_CACHE #endif //#ifdef TRACY_USE_IMAGE_CACHE
@ -982,7 +993,11 @@ debuginfod_client* GetDebuginfodClient()
void EndCallstack() void EndCallstack()
{ {
#ifdef TRACY_USE_IMAGE_CACHE #ifdef TRACY_USE_IMAGE_CACHE
tracy::tracy_free(s_imageCache); if( s_imageCache )
{
s_imageCache->~ImageCache();
tracy_free( s_imageCache );
}
#endif //#ifdef TRACY_USE_IMAGE_CACHE #endif //#ifdef TRACY_USE_IMAGE_CACHE
#ifndef TRACY_DEMANGLE #ifndef TRACY_DEMANGLE
___tracy_free_demangle_buffer(); ___tracy_free_demangle_buffer();