marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Use the standard file descriptor wait queue for named pipe server async waits.

oldstable
Alexandre Julliard 2007-04-18 16:28:01 +02:00
parent 6105a93be6
commit c18e8d6a69
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/fd.c
View File

@ -1738,12 +1738,12 @@ struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type,
assert(0); assert(0);
} }
if ((async = create_async( current, queue, data ))) if ((async = create_async( current, queue, data )) && type != ASYNC_TYPE_WAIT)
{ {
if (!fd->inode) if (!fd->inode)
set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) );
else /* regular files are always ready for read and write */ else /* regular files are always ready for read and write */
if (type != ASYNC_TYPE_WAIT) async_wake_up( queue, STATUS_ALERTED ); async_wake_up( queue, STATUS_ALERTED );
} }
return async; return async;
} }

8
server/named_pipe.c
View File

@ -76,7 +76,6 @@ struct pipe_server
struct named_pipe *pipe; struct named_pipe *pipe;
struct timeout_user *flush_poll; struct timeout_user *flush_poll;
struct event *event; struct event *event;
struct async_queue *wait_q; /* only a single one can be queued */
unsigned int options; /* pipe options */ unsigned int options; /* pipe options */
}; };
@ -385,8 +384,6 @@ static void pipe_server_destroy( struct object *obj)
server->client = NULL; server->client = NULL;
} }
free_async_queue( server->wait_q );
assert( server->pipe->instances ); assert( server->pipe->instances );
server->pipe->instances--; server->pipe->instances--;
@ -587,7 +584,7 @@ static void pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_dat
case ps_idle_server: case ps_idle_server:
case ps_wait_connect: case ps_wait_connect:
set_server_state( server, ps_wait_open ); set_server_state( server, ps_wait_open );
if ((async = create_async( current, server->wait_q, async_data ))) if ((async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT, 0 )))
{ {
if (server->pipe->waiters) async_wake_up( server->pipe->waiters, STATUS_SUCCESS ); if (server->pipe->waiters) async_wake_up( server->pipe->waiters, STATUS_SUCCESS );
release_object( async ); release_object( async );
@ -709,7 +706,6 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned
server->client = NULL; server->client = NULL;
server->flush_poll = NULL; server->flush_poll = NULL;
server->options = options; server->options = options;
server->wait_q = create_async_queue( NULL );
list_add_head( &pipe->servers, &server->entry ); list_add_head( &pipe->servers, &server->entry );
grab_object( pipe ); grab_object( pipe );
@ -791,7 +787,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc
if (client->fd && server->fd) if (client->fd && server->fd)
{ {
if (server->state == ps_wait_open) if (server->state == ps_wait_open)
async_wake_up( server->wait_q, STATUS_SUCCESS ); fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS );
set_server_state( server, ps_connected_server ); set_server_state( server, ps_connected_server );
server->client = client; server->client = client;
client->server = server; client->server = server;