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

Merge pull request #783 from tiago-rodrigues/trodrigues/image_cache_deadlock_fix

Browse Source 
Instead of calling dladdr inside the dl_iterate_phdr callback, do it outside to avoid deadlocks with other loader code
This commit is contained in:
Bartosz Taudul 2024-05-04 11:33:54 +02:00 committed by GitHub
commit c45683506c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
public/client/TracyCallstack.cpp
View File

@ -137,7 +137,8 @@ public:
private: private:
tracy::FastVector<ImageEntry> m_images; tracy::FastVector<ImageEntry> m_images;
bool m_updated; bool m_updated = false;
bool m_haveMainImageName = false;
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 )
{ {
@ -155,26 +156,13 @@ private:
image->m_startAddress = startAddress; image->m_startAddress = startAddress;
image->m_endAddress = endAddress; image->m_endAddress = endAddress;
const char* imageName = nullptr; // the base executable name isn't provided when iterating with dl_iterate_phdr,
// the base executable name isn't provided when iterating with dl_iterate_phdr, get it with dladdr() // we will have to patch the executable image name outside this callback
if( info->dlpi_name && info->dlpi_name[0] != '\0' ) if( info->dlpi_name && info->dlpi_name[0] != '\0' )
{ {
imageName = info->dlpi_name; size_t sz = strlen( info->dlpi_name ) + 1;
}
else
{
Dl_info dlInfo;
if( dladdr( (void *)info->dlpi_addr, &dlInfo ) )
{
imageName = dlInfo.dli_fname;
}
}
if( imageName )
{
size_t sz = strlen( imageName ) + 1;
image->m_name = (char*)tracy_malloc( sz ); image->m_name = (char*)tracy_malloc( sz );
memcpy( image->m_name, imageName, sz ); memcpy( image->m_name, info->dlpi_name, sz );
} }
else else
{ {
@ -200,9 +188,42 @@ private:
{ {
std::sort( m_images.begin(), m_images.end(), std::sort( m_images.begin(), m_images.end(),
[]( 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; } );
// patch the main executable image name here, as calling dl_* functions inside the dl_iterate_phdr callback might cause deadlocks
UpdateMainImageName();
} }
} }
void UpdateMainImageName()
{
if( m_haveMainImageName )
{
return;
}
for( ImageEntry& entry : m_images )
{
if( entry.m_name == nullptr )
{
Dl_info dlInfo;
if( dladdr( (void *)entry.m_startAddress, &dlInfo ) )
{
if( dlInfo.dli_fname )
{
size_t sz = strlen( dlInfo.dli_fname ) + 1;
entry.m_name = (char*)tracy_malloc( sz );
memcpy( entry.m_name, dlInfo.dli_fname, sz );
}
}
// we only expect one entry to be null for the main executable entry
break;
}
}
m_haveMainImageName = true;
}
const ImageEntry* GetImageForAddressImpl( 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,
@ -223,6 +244,7 @@ private:
} }
m_images.clear(); m_images.clear();
m_haveMainImageName = false;
} }
}; };
#endif //#ifdef TRACY_USE_IMAGE_CACHE #endif //#ifdef TRACY_USE_IMAGE_CACHE