wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

better aio error checking / avoid unnecessary repeated calls to aio_error (investigated on the occasion of the recent Linux aio trouble)

Browse Source 
This was SVN commit r9155.
This commit is contained in:
janwas 2011-04-03 20:07:55 +00:00
parent a9531bd88c
commit 3d21cf98f9
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/lib/file/file.cpp
View File

@ -131,11 +131,24 @@ LibError Issue(aiocb& req, int fd, wchar_t accessType, off_t alignedOfs, u8* ali
LibError WaitUntilComplete(aiocb& req, u8*& alignedBuf, size_t& alignedSize) LibError WaitUntilComplete(aiocb& req, u8*& alignedBuf, size_t& alignedSize)
{ {
#if CONFIG2_FILE_ENABLE_AIO #if CONFIG2_FILE_ENABLE_AIO
// wait for transfer to complete. const int err = aio_error(&req);
while(aio_error(&req) == EINPROGRESS) if(err == EINPROGRESS)
{ {
SUSPEND_AGAIN:
aiocb* const reqs = &req; aiocb* const reqs = &req;
aio_suspend(&reqs, 1, (timespec*)0); // wait indefinitely errno = 0;
const int ret = aio_suspend(&reqs, 1, (timespec*)0); // no timeout
if(ret != 0)
{
if(errno == EINTR) // interrupted by signal
goto SUSPEND_AGAIN;
return LibError_from_errno();
}
}
else if(err != 0)
{
errno = err;
return LibError_from_errno();
} }
const ssize_t bytesTransferred = aio_return(&req); const ssize_t bytesTransferred = aio_return(&req);