wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 634084 - Assertion failure: ready > 0, added debugging assertions, r=mcmanus

Browse Source
This commit is contained in:
Honza Bambas 2011-06-27 16:05:44 +02:00
parent 7356e15a3b
commit 7b148766d3
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nsprpub/pr/src/md/windows/w32poll.c
View File

@ -288,6 +288,8 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
*/ */
if (ready > 0) if (ready > 0)
{ {
PR_ASSERT(rd.fd_count || wt.fd_count || ex.fd_count);
ready = 0; ready = 0;
for (pd = pds, epd = pd + npds; pd < epd; pd++) for (pd = pds, epd = pd + npds; pd < epd; pd++)
{ {
@ -299,6 +301,7 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
PR_ASSERT(NULL != bottom); PR_ASSERT(NULL != bottom);
osfd = (SOCKET) bottom->secret->md.osfd; osfd = (SOCKET) bottom->secret->md.osfd;
PR_ASSERT(INVALID_SOCKET != osfd);
if (FD_ISSET(osfd, &rd)) if (FD_ISSET(osfd, &rd))
{ {
@ -306,6 +309,13 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
out_flags |= PR_POLL_READ; out_flags |= PR_POLL_READ;
if (pd->out_flags & _PR_POLL_WRITE_SYS_READ) if (pd->out_flags & _PR_POLL_WRITE_SYS_READ)
out_flags |= PR_POLL_WRITE; out_flags |= PR_POLL_WRITE;
// Adding assertion for |pd->out_flags| before |out_flags|
// to recognize if we have some out flags set on the socket
// or not ; if we do, then the out flags are not one of
// flags tested above
PR_ASSERT(pd->out_flags);
PR_ASSERT(out_flags);
} }
if (FD_ISSET(osfd, &wt)) if (FD_ISSET(osfd, &wt))
{ {
@ -313,12 +323,35 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout)
out_flags |= PR_POLL_READ; out_flags |= PR_POLL_READ;
if (pd->out_flags & _PR_POLL_WRITE_SYS_WRITE) if (pd->out_flags & _PR_POLL_WRITE_SYS_WRITE)
out_flags |= PR_POLL_WRITE; out_flags |= PR_POLL_WRITE;
PR_ASSERT(pd->out_flags);
PR_ASSERT(out_flags);
} }
if (FD_ISSET(osfd, &ex)) out_flags |= PR_POLL_EXCEPT; if (FD_ISSET(osfd, &ex)) out_flags |= PR_POLL_EXCEPT;
} }
pd->out_flags = out_flags; pd->out_flags = out_flags;
if (out_flags) ready++; if (out_flags) ready++;
} }
#ifdef DEBUG
if (ready == 0) {
printf("No ready socket but should be at least one, dumping: \n");
for (pd = pds, epd = pd + npds; pd < epd; pd++)
{
SOCKET osfd;
if (pd->fd) {
bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER);
osfd = (SOCKET) bottom->secret->md.osfd;
printf("\tfd=%p, in=%d, out=%d, osfd=%x / rd:%d wt:%d, ex:%d\n",
pd->fd, pd->in_flags, pd->out_flags, osfd,
FD_ISSET(osfd, &rd), FD_ISSET(osfd, &wt), FD_ISSET(osfd, &ex));
}
else {
printf("\tfd=NULL !\n");
}
}
}
#endif
PR_ASSERT(ready > 0); PR_ASSERT(ready > 0);
} }
else if (ready == SOCKET_ERROR) else if (ready == SOCKET_ERROR)