Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #15740 - now check for immediate errors from async i/o calls. Also ensure that io_pending flag for the thread is cleared if we complete the async call before calling WaitOnThisThread(). r=sfraser

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@50894 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sdagley%netscape.com
1999-10-15 23:35:27 +00:00
parent a1aaea4959
commit 8916be1144
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/nsprpub/pr/src/md/mac/macio.c
View File

@@ -264,8 +264,11 @@ PRInt32 ReadWriteProc(PRFileDesc *fd, void *buf, PRUint32 bytes, IOOperation op)
*/
if ( bytes > 20480L )
{
me->io_pending = PR_TRUE; /* Only mark thread io pending in async call */
(void) PBReadAsync(&pbAsync.pb);
err = PBReadAsync(&pbAsync.pb);
if (err != noErr && err != eofErr)
goto ErrorExit;
me->io_pending = PR_TRUE; /* Only mark thread io pending if async call worked */
}
else
{
@@ -280,14 +283,20 @@ PRInt32 ReadWriteProc(PRFileDesc *fd, void *buf, PRUint32 bytes, IOOperation op)
}
else
{
/* writes are currently always async so mark thread io pending */
/* writes are currently always async */
err = PBWriteAsync(&pbAsync.pb);
if (err != noErr)
goto ErrorExit;
/* Didn't get an error on the asyn call so mark thread io pending */
me->io_pending = PR_TRUE;
(void) PBWriteAsync(&pbAsync.pb);
}
/* See if the i/o call is still pending before we actually yield */
if (pbAsync.pb.ioParam.ioResult == 1)
WaitOnThisThread(me, PR_INTERVAL_NO_TIMEOUT);
else
me->io_pending = PR_FALSE; /* io completed so don't mark thread io pending */
}
err = me->md.osErrCode;