From 66f2053d1f72e821bd1100d8bf2266e73e2e2163 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 9 Apr 2017 03:13:25 +0200 Subject: [PATCH] server: Skip async completion when possible. --- dlls/ntdll/tests/pipe.c | 2 -- server/async.c | 10 ++++++++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index bea849f..06be9eb 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -394,9 +394,7 @@ static void test_completion(void) pov = (void *)0xdeadbeef; ret = GetQueuedCompletionStatus(port, &num_bytes, &key, &pov, 1000); - todo_wine ok(!ret, "GetQueuedCompletionStatus succeeded\n"); - todo_wine ok(pov == NULL, "expected NULL, got %p\n", pov); CloseHandle(ov.hEvent); diff --git a/server/async.c b/server/async.c index 4f1bcf1..11bbb25 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async int direct_result; /* a flag if we're passing result directly from request instead of APC */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ + unsigned int comp_flags; /* completion flags */ }; static void async_dump( struct object *obj, int verbose ); @@ -237,6 +238,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->wait_handle = 0; async->direct_result = 0; async->completion = fd_get_completion( fd, &async->comp_key ); + async->comp_flags = 0; if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; @@ -256,7 +258,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da /* create an async associated with iosb for async-based requests * returned async must be passed to async_handoff */ -struct async *create_request_async( struct fd *fd, const async_data_t *data ) +struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ) { struct async *async; struct iosb *iosb; @@ -274,6 +276,7 @@ struct async *create_request_async( struct fd *fd, const async_data_t *data ) return NULL; } async->direct_result = 1; + async->comp_flags = comp_flags; } return async; } @@ -375,8 +378,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota data.user.args[2] = 0; thread_queue_apc( NULL, async->thread, NULL, &data ); } - else if (async->data.apc_context) + else if (async->data.apc_context && (!async->direct_result || + !(async->comp_flags & COMPLETION_SKIP_ON_SUCCESS))) + { add_async_completion( async, async->data.apc_context, status, total ); + } if (async->event) set_event( async->event ); else if (async->fd) set_fd_signaled( async->fd, 1 ); diff --git a/server/fd.c b/server/fd.c index a6a96d6..64dbd1b 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2434,7 +2434,7 @@ DECL_HANDLER(flush) if (!fd) return; - if ((async = create_request_async( fd, &req->async ))) + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { reply->event = async_handoff( async, fd->fd_ops->flush( fd, async ), NULL ); release_object( async ); @@ -2533,7 +2533,7 @@ DECL_HANDLER(read) if (!fd) return; - if ((async = create_request_async( fd, &req->async ))) + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL ); reply->options = fd->options; @@ -2550,7 +2550,7 @@ DECL_HANDLER(write) if (!fd) return; - if ((async = create_request_async( fd, &req->async ))) + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size ); reply->options = fd->options; @@ -2568,7 +2568,7 @@ DECL_HANDLER(ioctl) if (!fd) return; - if ((async = create_request_async( fd, &req->async ))) + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { reply->wait = async_handoff( async, fd->fd_ops->ioctl( fd, req->code, async ), NULL ); reply->options = fd->options; diff --git a/server/file.h b/server/file.h index 1d25961..ed42fc4 100644 --- a/server/file.h +++ b/server/file.h @@ -185,7 +185,7 @@ extern struct object *create_serial( struct fd *fd ); /* async I/O functions */ extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct fd *fd, struct thread *thread, const async_data_t *data, struct iosb *iosb ); -extern struct async *create_request_async( struct fd *fd, const async_data_t *data ); +extern struct async *create_request_async( struct fd *fd, unsigned int comp_flags, const async_data_t *data ); extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); -- 1.9.1