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

FolderMemoryCard: Move file existence check into the helper class, so that it gets called much less often. 

This *drastically* increases performance, bizarrely enough.
This commit is contained in:
Admiral H. Curtiss 2015-06-01 18:18:15 +02:00
parent f73db1a572
commit 41c3eacb6f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcsx2/gui/MemoryCardFolder.cpp
View File

@ -589,9 +589,6 @@ bool FolderMemoryCard::ReadFromFile( u8 *dest, u32 adr, u32 dataLength ) {
u32 clusterNumber; u32 clusterNumber;
const MemoryCardFileEntry* const entry = GetFileEntryFromFileDataCluster( m_superBlock.data.rootdir_cluster, fatCluster, &fileName, fileName.GetDirCount(), &clusterNumber ); const MemoryCardFileEntry* const entry = GetFileEntryFromFileDataCluster( m_superBlock.data.rootdir_cluster, fatCluster, &fileName, fileName.GetDirCount(), &clusterNumber );
if ( entry != nullptr ) { if ( entry != nullptr ) {
if ( !fileName.DirExists() ) {
fileName.Mkdir();
}
wxFFile* file = m_lastAccessedFile.ReOpen( fileName.GetFullPath(), L"rb" ); wxFFile* file = m_lastAccessedFile.ReOpen( fileName.GetFullPath(), L"rb" );
if ( file->IsOpened() ) { if ( file->IsOpened() ) {
const u32 clusterOffset = ( page % 2 ) * PageSize + offset; const u32 clusterOffset = ( page % 2 ) * PageSize + offset;
@ -879,13 +876,6 @@ bool FolderMemoryCard::WriteToFile( const u8* src, u32 adr, u32 dataLength ) {
u32 clusterNumber; u32 clusterNumber;
const MemoryCardFileEntry* const entry = GetFileEntryFromFileDataCluster( m_superBlock.data.rootdir_cluster, fatCluster, &fileName, fileName.GetDirCount(), &clusterNumber ); const MemoryCardFileEntry* const entry = GetFileEntryFromFileDataCluster( m_superBlock.data.rootdir_cluster, fatCluster, &fileName, fileName.GetDirCount(), &clusterNumber );
if ( entry != nullptr ) { if ( entry != nullptr ) {
if ( !fileName.DirExists() ) {
fileName.Mkdir();
}
if ( !fileName.FileExists() ) {
wxFFile createEmptyFile( fileName.GetFullPath(), L"wb" );
createEmptyFile.Close();
}
wxFFile* file = m_lastAccessedFile.ReOpen( fileName.GetFullPath(), L"r+b" ); wxFFile* file = m_lastAccessedFile.ReOpen( fileName.GetFullPath(), L"r+b" );
if ( file->IsOpened() ) { if ( file->IsOpened() ) {
const u32 clusterOffset = ( page % 2 ) * PageSize + offset; const u32 clusterOffset = ( page % 2 ) * PageSize + offset;
@ -1061,6 +1051,16 @@ FileAccessHelper::~FileAccessHelper() {
wxFFile* FileAccessHelper::Open( const wxString& filename, const wxString& mode ) { wxFFile* FileAccessHelper::Open( const wxString& filename, const wxString& mode ) {
this->Close(); this->Close();
wxFileName fn( filename );
if ( !fn.FileExists() ) {
if ( !fn.DirExists() ) {
fn.Mkdir();
}
wxFFile createEmptyFile( filename, L"wb" );
createEmptyFile.Close();
}
m_file = new wxFFile( filename, mode ); m_file = new wxFFile( filename, mode );
m_filename = filename; m_filename = filename;
m_mode = mode; m_mode = mode;