mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-23 10:17:44 +00:00
Code Activity

use name cache for win32 as well

Browse source
This commit is contained in:
AriAvery 2023-04-24 10:21:14 +02:00
parent 9810a41148
commit 76f540e881
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/common/Exd/ExdData.h
View file

@ -47,6 +47,7 @@ namespace Sapphire::Data
xiv::exd::Exd& getSheet(); xiv::exd::Exd& getSheet();
std::unordered_map< std::type_index, xiv::exd::Exd > m_sheets; std::unordered_map< std::type_index, xiv::exd::Exd > m_sheets;
std::unordered_map< std::type_index, std::string > m_name_cache;
std::shared_ptr< xiv::dat::GameData > m_data; std::shared_ptr< xiv::dat::GameData > m_data;
std::shared_ptr< xiv::exd::ExdData > m_exd_data; std::shared_ptr< xiv::exd::ExdData > m_exd_data;
}; };
@ -54,27 +55,28 @@ namespace Sapphire::Data
template< typename T > template< typename T >
std::string ExdData::getSheetName() std::string ExdData::getSheetName()
{ {
auto type = std::type_index( typeid( T ) );
auto it = m_name_cache.find( type );
if( it != m_name_cache.end() )
{
return it->second;
}
auto origName = std::string( typeid( T ).name() ); auto origName = std::string( typeid( T ).name() );
#if _WIN32 #if _WIN32
auto pos = origName.find_last_of( ':' ); auto pos = origName.find_last_of( ':' );
if( pos != std::string::npos ) if( pos != std::string::npos )
{ {
return origName.substr( pos + 1 ); std::string sheetName = origName.substr( pos + 1 );
m_name_cache[ type ] = sheetName;
return sheetName;
} }
else else
{ {
throw std::runtime_error( "Failed to extract the sheet name" ); throw std::runtime_error( "Failed to extract the sheet name" );
} }
#else #else
static std::unordered_map< std::type_index, std::string > demangle_cache;
auto type = std::type_index( typeid( T ) );
auto it = demangle_cache.find( type );
if( it != demangle_cache.end() )
{
return it->second;
}
int status = -4; int status = -4;
char* res = abi::__cxa_demangle( origName.c_str(), nullptr, nullptr, &status ); char* res = abi::__cxa_demangle( origName.c_str(), nullptr, nullptr, &status );
if( status == 0 ) if( status == 0 )
@ -82,7 +84,7 @@ namespace Sapphire::Data
std::string demangledName = res; std::string demangledName = res;
auto pos = demangledName.find_last_of( ':' ); auto pos = demangledName.find_last_of( ':' );
if( pos != std::string::npos ) demangledName = demangledName.substr( pos + 1 ); if( pos != std::string::npos ) demangledName = demangledName.substr( pos + 1 );
demangle_cache[ type ] = demangledName; m_name_cache[ type ] = demangledName;
free( res ); free( res );
return demangledName; return demangledName;
} }