Zebediah Figura : server: Use default_fd_signaled() for sockets.
Alexandre Julliard
julliard at winehq.org
Thu Mar 18 16:43:53 CDT 2021
Module: wine
Branch: master
Commit: 731339cd60c255fd5890063b144ad7c00661f5a0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=731339cd60c255fd5890063b144ad7c00661f5a0
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Mar 18 00:41:25 2021 -0500
server: Use default_fd_signaled() for sockets.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/sock.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/server/sock.c b/server/sock.c
index 8ab7d5b7236..775ec6edf32 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -163,7 +163,6 @@ struct sock
};
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 int sock_close_handle( struct object *obj, struct process *process, obj_handle_t handle );
static void sock_destroy( struct object *obj );
@@ -189,7 +188,7 @@ static const struct object_ops sock_ops =
sock_dump, /* dump */
add_queue, /* add_queue */
remove_queue, /* remove_queue */
- sock_signaled, /* signaled */
+ default_fd_signaled, /* signaled */
no_satisfied, /* satisfied */
no_signal, /* signal */
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 );
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 );
}
@@ -789,14 +784,6 @@ static void sock_dump( struct object *obj, int verbose )
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 )
{
struct sock *sock = get_fd_user( fd );
More information about the wine-cvs
mailing list