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

server: Use default_fd_signaled() for sockets. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-03-18 00:41:25 -05:00 committed by Alexandre Julliard
parent fe9e2f070b
commit 731339cd60
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/sock.c
View File

@ -163,7 +163,6 @@ struct sock
}; };
static void sock_dump( struct object *obj, int verbose ); static void sock_dump( struct object *obj, int verbose );
static int sock_signaled( struct object *obj, struct wait_queue_entry *entry );
static struct fd *sock_get_fd( struct object *obj ); static struct fd *sock_get_fd( struct object *obj );
static int sock_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static int sock_close_handle( struct object *obj, struct process *process, obj_handle_t handle );
static void sock_destroy( struct object *obj ); static void sock_destroy( struct object *obj );
@ -189,7 +188,7 @@ static const struct object_ops sock_ops =
sock_dump, /* dump */ sock_dump, /* dump */
add_queue, /* add_queue */ add_queue, /* add_queue */
remove_queue, /* remove_queue */ remove_queue, /* remove_queue */
sock_signaled, /* signaled */ default_fd_signaled, /* signaled */
no_satisfied, /* satisfied */ no_satisfied, /* satisfied */
no_signal, /* signal */ no_signal, /* signal */
sock_get_fd, /* get_fd */ sock_get_fd, /* get_fd */
@ -773,10 +772,6 @@ static void sock_poll_event( struct fd *fd, int event )
event = sock_dispatch_asyncs( sock, event, error ); event = sock_dispatch_asyncs( sock, event, error );
sock_dispatch_events( sock, prevstate, event, error ); sock_dispatch_events( sock, prevstate, event, error );
/* if anyone is stupid enough to wait on the socket object itself,
* maybe we should wake them up too, just in case? */
wake_up( &sock->obj, 0 );
sock_reselect( sock ); sock_reselect( sock );
} }
@ -789,14 +784,6 @@ static void sock_dump( struct object *obj, int verbose )
sock->mask, sock->pmask, sock->hmask ); sock->mask, sock->pmask, sock->hmask );
} }
static int sock_signaled( struct object *obj, struct wait_queue_entry *entry )
{
struct sock *sock = (struct sock *)obj;
assert( obj->ops == &sock_ops );
return check_fd_events( sock->fd, sock_get_poll_events( sock->fd ) ) != 0;
}
static int sock_get_poll_events( struct fd *fd ) static int sock_get_poll_events( struct fd *fd )
{ {
struct sock *sock = get_fd_user( fd ); struct sock *sock = get_fd_user( fd );