mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-23 09:41:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't open/close file for every file operation.

Browse Source
This commit is contained in:
Jordan Woyak 2013-03-04 02:01:23 -06:00
parent 04a33b177a
commit efcb2abe9b
2 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
View File

@ -139,27 +139,36 @@ bool CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
return true; return true;
} }
File::IOFile CWII_IPC_HLE_Device_FileIO::OpenFile() // Opens file if needed.
// Clears any error state.
// Seeks to proper position position.
void CWII_IPC_HLE_Device_FileIO::PrepareFile()
{ {
const char* open_mode = ""; if (!m_file.IsOpen())
switch (m_Mode)
{ {
case ISFS_OPEN_READ: const char* open_mode = "";
open_mode = "rb";
break;
case ISFS_OPEN_WRITE: switch (m_Mode)
case ISFS_OPEN_RW: {
open_mode = "r+b"; case ISFS_OPEN_READ:
break; open_mode = "rb";
break;
default: case ISFS_OPEN_WRITE:
PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode); case ISFS_OPEN_RW:
break; open_mode = "r+b";
break;
default:
PanicAlertT("FileIO: Unknown open mode : 0x%02x", m_Mode);
break;
}
m_file.Open(m_filepath, open_mode);
} }
return File::IOFile(m_filepath, open_mode); m_file.Clear();
m_file.Seek(m_SeekPos, SEEK_SET);
} }
bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress) bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
@ -168,11 +177,12 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
const u32 SeekOffset = Memory::Read_U32(_CommandAddress + 0xC); const u32 SeekOffset = Memory::Read_U32(_CommandAddress + 0xC);
const u32 Mode = Memory::Read_U32(_CommandAddress + 0x10); const u32 Mode = Memory::Read_U32(_CommandAddress + 0x10);
if (auto file = OpenFile()) PrepareFile();
if (m_file)
{ {
ReturnValue = FS_RESULT_FATAL; ReturnValue = FS_RESULT_FATAL;
const u64 fileSize = file.GetSize(); const u64 fileSize = m_file.GetSize();
INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekOffset, Mode, m_Name.c_str(), fileSize); INFO_LOG(WII_IPC_FILEIO, "FileIO: Seek Pos: 0x%08x, Mode: %i (%s, Length=0x%08llx)", SeekOffset, Mode, m_Name.c_str(), fileSize);
u64 wantedPos = 0; u64 wantedPos = 0;
switch (Mode) switch (Mode)
@ -182,7 +192,7 @@ bool CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
break; break;
case 1: case 1:
wantedPos = m_SeekPos + SeekOffset; wantedPos = m_SeekPos + (s32)SeekOffset;
break; break;
case 2: case 2:
@ -217,8 +227,8 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Read to this memory address
const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); const u32 Size = Memory::Read_U32(_CommandAddress + 0x10);
PrepareFile();
if (auto file = OpenFile()) if (m_file)
{ {
if (m_Mode == ISFS_OPEN_WRITE) if (m_Mode == ISFS_OPEN_WRITE)
{ {
@ -227,9 +237,8 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
else else
{ {
INFO_LOG(WII_IPC_FILEIO, "FileIO: Read 0x%x bytes to 0x%08x from %s", Size, Address, m_Name.c_str()); INFO_LOG(WII_IPC_FILEIO, "FileIO: Read 0x%x bytes to 0x%08x from %s", Size, Address, m_Name.c_str());
file.Seek(m_SeekPos, SEEK_SET); ReturnValue = (u32)fread(Memory::GetPointer(Address), 1, Size, m_file.GetHandle());
ReturnValue = (u32)fread(Memory::GetPointer(Address), 1, Size, file.GetHandle()); if (ReturnValue != Size && ferror(m_file.GetHandle()))
if (ReturnValue != Size && ferror(file.GetHandle()))
{ {
ReturnValue = FS_EACCESS; ReturnValue = FS_EACCESS;
} }
@ -256,8 +265,8 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress)
const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address const u32 Address = Memory::Read_U32(_CommandAddress + 0xC); // Write data from this memory address
const u32 Size = Memory::Read_U32(_CommandAddress + 0x10); const u32 Size = Memory::Read_U32(_CommandAddress + 0x10);
PrepareFile();
if (auto file = OpenFile()) if (m_file)
{ {
if (m_Mode == ISFS_OPEN_READ) if (m_Mode == ISFS_OPEN_READ)
{ {
@ -266,8 +275,7 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress)
else else
{ {
INFO_LOG(WII_IPC_FILEIO, "FileIO: Write 0x%04x bytes from 0x%08x to %s", Size, Address, m_Name.c_str()); INFO_LOG(WII_IPC_FILEIO, "FileIO: Write 0x%04x bytes from 0x%08x to %s", Size, Address, m_Name.c_str());
file.Seek(m_SeekPos, SEEK_SET); if (m_file.WriteBytes(Memory::GetPointer(Address), Size))
if (file.WriteBytes(Memory::GetPointer(Address), Size))
{ {
ReturnValue = Size; ReturnValue = Size;
m_SeekPos += Size; m_SeekPos += Size;
@ -297,9 +305,10 @@ bool CWII_IPC_HLE_Device_FileIO::IOCtl(u32 _CommandAddress)
{ {
case ISFS_IOCTL_GETFILESTATS: case ISFS_IOCTL_GETFILESTATS:
{ {
if (auto file = OpenFile()) PrepareFile();
if (m_file)
{ {
u32 m_FileLength = (u32)file.GetSize(); u32 m_FileLength = (u32)m_file.GetSize();
const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18); const u32 BufferOut = Memory::Read_U32(_CommandAddress + 0x18);
INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS"); INFO_LOG(WII_IPC_FILEIO, "FileIO: ISFS_IOCTL_GETFILESTATS");
@ -335,5 +344,6 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p)
p.Do(m_Mode); p.Do(m_Mode);
p.Do(m_SeekPos); p.Do(m_SeekPos);
m_file.Close();
m_filepath = HLE_IPC_BuildFilename(m_Name, 64); m_filepath = HLE_IPC_BuildFilename(m_Name, 64);
} }

5
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.h
View File

@ -39,9 +39,9 @@ public:
bool IOCtl(u32 _CommandAddress); bool IOCtl(u32 _CommandAddress);
void DoState(PointerWrap &p); void DoState(PointerWrap &p);
File::IOFile OpenFile();
private: private:
void PrepareFile();
enum enum
{ {
ISFS_OPEN_READ = 1, ISFS_OPEN_READ = 1,
@ -77,6 +77,7 @@ private:
u32 m_Mode; u32 m_Mode;
u32 m_SeekPos; u32 m_SeekPos;
File::IOFile m_file;
std::string m_filepath; std::string m_filepath;
}; };