ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Don't poll for POLLIN or POLLPRI if there are alerted read asyncs. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-05-05 00:43:26 -05:00 committed by Alexandre Julliard
parent cafd260014
commit 04b33ef098
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ws2_32/tests/afd.c
View File

@ -382,7 +382,7 @@ static void test_poll(void)
ok(size == 1, "got size %lu\n", size);
ret = WaitForSingleObject(event, 0);
todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret);
ok(ret == WAIT_TIMEOUT, "got %#x\n", ret);
ret = send(client, "a", 1, 0);
ok(ret == 1, "got %d\n", ret);

34
server/sock.c
View File

@ -1229,6 +1229,18 @@ static int sock_get_poll_events( struct fd *fd )
if (!sock->type) /* not initialized yet */
return -1;
LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry )
{
unsigned int i;
for (i = 0; i < req->count; ++i)
{
if (req->sockets[i].sock != sock) continue;
ev |= poll_flags_from_afd( sock, req->sockets[i].mask );
}
}
switch (sock->state)
{
case SOCK_UNCONNECTED:
@ -1271,7 +1283,15 @@ static int sock_get_poll_events( struct fd *fd )
}
else if (async_queued( &sock->read_q ))
{
if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI;
/* Clear POLLIN and POLLPRI if we have an alerted async, even if
* we're polling this socket for READ or OOB. We can't signal the
* poll if the pending async will read all of the data [cf. the
* matching logic in sock_dispatch_asyncs()], but we also don't
* want to spin polling for POLLIN if we're not going to use it. */
if (async_waiting( &sock->read_q ))
ev |= POLLIN | POLLPRI;
else
ev &= ~(POLLIN | POLLPRI);
}
else
{
@ -1302,18 +1322,6 @@ static int sock_get_poll_events( struct fd *fd )
break;
}
LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry )
{
unsigned int i;
for (i = 0; i < req->count; ++i)
{
if (req->sockets[i].sock != sock) continue;
ev |= poll_flags_from_afd( sock, req->sockets[i].mask );
}
}
return ev;
}