ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcsx2: Remove GameDB blocktable 

It doesn't provides much of a performance improvement over directly
using an unordered map. This change also means that if there are
duplicate GameDB entries then they'll be merged together instead of
having only the last entry take effect.

Also increase the unordered map reserve size.
This commit is contained in:
Jonathan Li 2018-08-26 01:25:59 +01:00
parent fcda371f9a
commit 4dcb47d829
2 changed files with 5 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pcsx2/GameDatabase.cpp
View File

@ -17,32 +17,9 @@
#include "GameDatabase.h"
BaseGameDatabaseImpl::BaseGameDatabaseImpl()
: gHash( 9400 )
: gHash( 9900 )
, m_baseKey( L"Serial" )
{
m_BlockTable.reserve(48);
m_CurBlockWritePos = 0;
m_BlockTableWritePos = 0;
m_GamesPerBlock = 256;
m_BlockTable.push_back(NULL);
}
BaseGameDatabaseImpl::~BaseGameDatabaseImpl()
{
for(uint blockidx=0; blockidx<=m_BlockTableWritePos; ++blockidx)
{
if( !m_BlockTable[blockidx] ) continue;
const uint endidx = (blockidx == m_BlockTableWritePos) ? m_CurBlockWritePos : m_GamesPerBlock;
for( uint gameidx=0; gameidx<endidx; ++gameidx )
m_BlockTable[blockidx][gameidx].~Game_Data();
safe_free( m_BlockTable[blockidx] );
}
}
// Sets the current game to the one matching the serial id given
@ -54,30 +31,13 @@ bool BaseGameDatabaseImpl::findGame(Game_Data& dest, const wxString& id) {
dest.clear();
return false;
}
dest = *iter->second;
dest = iter->second;
return true;
}
Game_Data* BaseGameDatabaseImpl::createNewGame( const wxString& id )
{
if(!m_BlockTable[m_BlockTableWritePos])
m_BlockTable[m_BlockTableWritePos] = (Game_Data*)malloc(m_GamesPerBlock * sizeof(Game_Data));
Game_Data* block = m_BlockTable[m_BlockTableWritePos];
Game_Data* retval = &block[m_CurBlockWritePos];
gHash[id] = retval;
new (retval) Game_Data(id);
if( ++m_CurBlockWritePos >= m_GamesPerBlock )
{
++m_BlockTableWritePos;
m_CurBlockWritePos = 0;
m_BlockTable.push_back(NULL);
}
return retval;
return &gHash.emplace(id, Game_Data{id}).first->second;
}
// Searches the current game's data to see if the given key exists

9
pcsx2/GameDatabase.h
View File

@ -131,7 +131,7 @@ public:
virtual Game_Data* createNewGame( const wxString& id )=0;
};
typedef std::unordered_map<wxString, Game_Data*, StringHash> GameDataHash;
using GameDataHash = std::unordered_map<wxString, Game_Data, StringHash>;
// --------------------------------------------------------------------------------------
// BaseGameDatabaseImpl
@ -142,14 +142,9 @@ protected:
GameDataHash gHash; // hash table of game serials matched to their gList indexes!
wxString m_baseKey;
std::vector<Game_Data*> m_BlockTable;
uint m_BlockTableWritePos;
int m_CurBlockWritePos;
int m_GamesPerBlock;
public:
BaseGameDatabaseImpl();
virtual ~BaseGameDatabaseImpl();
virtual ~BaseGameDatabaseImpl() = default;
wxString getBaseKey() const { return m_baseKey; }
void setBaseKey( const wxString& key ) { m_baseKey = key; }