system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 20:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Get rid of sock_try_event.

Browse source 
We *might* need to ignore POLLERR messages for UDP sockets, as the
condition is actually temporary and sock_try_event was hiding this.
This commit is contained in:
Mike Kaplinskiy 2010-05-13 16:42:04 -04:00 committed by Alexandre Julliard
parent d03fe9d4ec
commit 4f9e09ea57
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
server/sock.c
View file

@ -254,18 +254,6 @@ static int sock_reselect( struct sock *sock )
return ev; return ev;
} }
/* After POLLHUP is received, the socket will no longer be in the main select loop.
This function is used to signal pending events nevertheless */
static void sock_try_event( struct sock *sock, int event )
{
event = check_fd_events( sock->fd, event );
if (event)
{
if ( debug_level ) fprintf( stderr, "sock_try_event: %x\n", event );
sock_poll_event( sock->fd, event );
}
}
/* wake anybody waiting on the socket event or send the associated message */ /* wake anybody waiting on the socket event or send the associated message */
static void sock_wake_up( struct sock *sock, int pollev ) static void sock_wake_up( struct sock *sock, int pollev )
{ {
@ -509,7 +497,6 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type,
{ {
struct sock *sock = get_fd_user( fd ); struct sock *sock = get_fd_user( fd );
struct async_queue *queue; struct async_queue *queue;
int pollev;
assert( sock->obj.ops == &sock_ops ); assert( sock->obj.ops == &sock_ops );
@ -541,15 +528,13 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type,
set_error( STATUS_PENDING ); set_error( STATUS_PENDING );
} }
pollev = sock_reselect( sock ); sock_reselect( sock );
if ( pollev ) sock_try_event( sock, pollev );
} }
static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) static void sock_reselect_async( struct fd *fd, struct async_queue *queue )
{ {
struct sock *sock = get_fd_user( fd ); struct sock *sock = get_fd_user( fd );
int events = sock_reselect( sock ); sock_reselect( sock );
if (events) sock_try_event( sock, events );
} }
static void sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb ) static void sock_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb )
@ -883,7 +868,6 @@ DECL_HANDLER(set_socket_event)
if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event); if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event);
pollev = sock_reselect( sock ); pollev = sock_reselect( sock );
if ( pollev ) sock_try_event( sock, pollev );
if (sock->mask) if (sock->mask)
sock->state |= FD_WINE_NONBLOCKING; sock->state |= FD_WINE_NONBLOCKING;
@ -943,7 +927,6 @@ DECL_HANDLER(get_socket_event)
DECL_HANDLER(enable_socket_event) DECL_HANDLER(enable_socket_event)
{ {
struct sock *sock; struct sock *sock;
int pollev;
if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle, if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle,
FILE_WRITE_ATTRIBUTES, &sock_ops))) FILE_WRITE_ATTRIBUTES, &sock_ops)))
@ -955,8 +938,7 @@ DECL_HANDLER(enable_socket_event)
sock->state &= ~req->cstate; sock->state &= ~req->cstate;
if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK; if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK;
pollev = sock_reselect( sock ); sock_reselect( sock );
if ( pollev ) sock_try_event( sock, pollev );
release_object( &sock->obj ); release_object( &sock->obj );
} }