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

pcsx2: aio: Complete POSIX AIO reader

This commit is contained in:
Jonathan Li 2016-05-18 00:10:27 +01:00
parent e10ed744bc
commit 6362b9c9b2
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/AsyncFileReader.h
View File

@ -78,7 +78,8 @@ class FlatFileReader : public AsyncFileReader
io_context_t m_aio_context; io_context_t m_aio_context;
#elif defined(__POSIX__) #elif defined(__POSIX__)
int m_fd; // TODO OSX don't know if overlap as an equivalent on OSX int m_fd; // TODO OSX don't know if overlap as an equivalent on OSX
struct aiocb m_aio_context; struct aiocb m_aiocb;
bool m_read_in_progress;
#endif #endif
bool shareWrite; bool shareWrite;

78
pcsx2/Darwin/DarwinFlatFileReader.cpp
View File

@ -16,15 +16,16 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "AsyncFileReader.h" #include "AsyncFileReader.h"
#warning This reader is not yet implemented. Crash boom bang if used #if defined(__APPLE__)
#warning Tested on FreeBSD, not OS X. Be very afraid.
#endif
//FlatFileReader::FlatFileReader(void) //FlatFileReader::FlatFileReader(void)
FlatFileReader::FlatFileReader(bool shareWrite) : shareWrite(shareWrite) FlatFileReader::FlatFileReader(bool shareWrite) : shareWrite(shareWrite)
{ {
printf("FLATC\n");
m_blocksize = 2048; m_blocksize = 2048;
m_fd = 0; m_fd = -1;
//m_aio_context = 0; m_read_in_progress = false;
} }
FlatFileReader::~FlatFileReader(void) FlatFileReader::~FlatFileReader(void)
@ -34,79 +35,74 @@ FlatFileReader::~FlatFileReader(void)
bool FlatFileReader::Open(const wxString& fileName) bool FlatFileReader::Open(const wxString& fileName)
{ {
printf("OB\n");
m_filename = fileName; m_filename = fileName;
int err = 0; //io_setup(64, &m_aio_context);
if (err) return false;
m_fd = wxOpen(fileName, O_RDONLY, 0); m_fd = wxOpen(fileName, O_RDONLY, 0);
return (m_fd != 0); return (m_fd != -1);
} }
int FlatFileReader::ReadSync(void* pBuffer, uint sector, uint count) int FlatFileReader::ReadSync(void* pBuffer, uint sector, uint count)
{ {
printf("RAD\n");
BeginRead(pBuffer, sector, count); BeginRead(pBuffer, sector, count);
return FinishRead(); return FinishRead();
} }
void FlatFileReader::BeginRead(void* pBuffer, uint sector, uint count) void FlatFileReader::BeginRead(void* pBuffer, uint sector, uint count)
{ {
printf("RWEADB\n"); u64 offset = sector * (u64)m_blocksize + m_dataoffset;
u64 offset;
offset = sector * (u64)m_blocksize + m_dataoffset;
u32 bytesToRead = count * m_blocksize; u32 bytesToRead = count * m_blocksize;
struct aiocb iocb; m_aiocb = {0};
struct aiocb* iocbs = &iocb; m_aiocb.aio_fildes = m_fd;
m_aiocb.aio_offset = offset;
m_aiocb.aio_nbytes = bytesToRead;
m_aiocb.aio_buf = pBuffer;
//io_prep_pread(&iocb, m_fd, pBuffer, bytesToRead, offset); if (aio_read(&m_aiocb) != 0) {
//io_submit(m_aio_context, 1, &iocbs); #if defined(__FreeBSD__)
if (errno == ENOSYS)
Console.Error("AIO read failed: Check the aio kernel module is loaded");
else
Console.Error("AIO read failed: error code %d", errno);
#else
Console.Error("AIO read failed: error code %d\n", errno);
#endif
return;
}
m_read_in_progress = true;
} }
int FlatFileReader::FinishRead(void) int FlatFileReader::FinishRead(void)
{ {
printf("FINISH\n"); struct aiocb *aiocb_list[] = {&m_aiocb};
u32 bytes;
int min_nr = 1; while (aio_suspend(aiocb_list, 1, nullptr) == -1)
int max_nr = 1; if (errno != EINTR)
/* struct io_event* events = new io_event[max_nr]; break;
int event = io_getevents(m_aio_context, min_nr, max_nr, events, NULL); m_read_in_progress = false;
if (event < 1) { return aio_return(&m_aiocb) == -1? -1: 1;
return -1;
}*/
return 1;
} }
void FlatFileReader::CancelRead(void) void FlatFileReader::CancelRead(void)
{ {
printf("CANCEL\n"); aio_cancel(m_fd, &m_aiocb);
// Will be done when m_aio_context context is destroyed m_read_in_progress = false;
// Note: io_cancel exists but need the iocb structure as parameter
// int io_cancel(aio_context_t ctx_id, struct iocb *iocb,
// struct io_event *result);
} }
void FlatFileReader::Close(void) void FlatFileReader::Close(void)
{ {
printf("CLOSE\n"); if (m_read_in_progress)
if (m_fd) close(m_fd); CancelRead();
if (m_fd != -1)
close(m_fd);
//io_destroy(m_aio_context); m_fd = -1;
aio_cancel(m_fd, &m_aio_context);
m_fd = 0;
//m_aio_context = 0;
} }
uint FlatFileReader::GetBlockCount(void) const uint FlatFileReader::GetBlockCount(void) const
{ {
printf("BLOCKS\n");
return (int)(Path::GetFileSize(m_filename) / m_blocksize); return (int)(Path::GetFileSize(m_filename) / m_blocksize);
} }