system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

server: Store pending flag in async object.

Browse source 
Instead of abusing direct_result.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-05-23 19:36:06 +02:00 committed by Alexandre Julliard
parent c09a903bfa
commit 215adcefa3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/async.c
View file

@ -45,12 +45,13 @@ struct async
unsigned int status; /* current status */ unsigned int status; /* current status */
struct timeout_user *timeout; struct timeout_user *timeout;
unsigned int timeout_status; /* status to report upon timeout */ unsigned int timeout_status; /* status to report upon timeout */
int signaled;
struct event *event; struct event *event;
async_data_t data; /* data for async I/O call */ async_data_t data; /* data for async I/O call */
struct iosb *iosb; /* I/O status block */ struct iosb *iosb; /* I/O status block */
obj_handle_t wait_handle; /* pre-allocated wait handle */ obj_handle_t wait_handle; /* pre-allocated wait handle */
int direct_result; /* a flag if we're passing result directly from request instead of APC */ unsigned int signaled :1;
unsigned int pending :1; /* request is succesfully queued, but pending */
unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */
struct completion *completion; /* completion associated with fd */ struct completion *completion; /* completion associated with fd */
apc_param_t comp_key; /* completion key associated with fd */ apc_param_t comp_key; /* completion key associated with fd */
unsigned int comp_flags; /* completion flags */ unsigned int comp_flags; /* completion flags */
@ -238,6 +239,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da
async->queue = NULL; async->queue = NULL;
async->fd = (struct fd *)grab_object( fd ); async->fd = (struct fd *)grab_object( fd );
async->signaled = 0; async->signaled = 0;
async->pending = 1;
async->wait_handle = 0; async->wait_handle = 0;
async->direct_result = 0; async->direct_result = 0;
async->completion = fd_get_completion( fd, &async->comp_key ); async->completion = fd_get_completion( fd, &async->comp_key );
@ -278,6 +280,7 @@ struct async *create_request_async( struct fd *fd, unsigned int comp_flags, cons
release_object( async ); release_object( async );
return NULL; return NULL;
} }
async->pending = 0;
async->direct_result = 1; async->direct_result = 1;
async->comp_flags = comp_flags; async->comp_flags = comp_flags;
} }
@ -317,6 +320,7 @@ obj_handle_t async_handoff( struct async *async, int success, data_size_t *resul
else else
{ {
async->direct_result = 0; async->direct_result = 0;
async->pending = 1;
if (!force_blocking && async->fd && is_fd_overlapped( async->fd )) if (!force_blocking && async->fd && is_fd_overlapped( async->fd ))
{ {
close_handle( async->thread->process, async->wait_handle); close_handle( async->thread->process, async->wait_handle);
@ -381,7 +385,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota
data.user.args[2] = 0; data.user.args[2] = 0;
thread_queue_apc( NULL, async->thread, NULL, &data ); thread_queue_apc( NULL, async->thread, NULL, &data );
} }
else if (async->data.apc_context && (!async->direct_result || else if (async->data.apc_context && (async->pending ||
!(async->comp_flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS))) !(async->comp_flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS)))
{ {
add_async_completion( async, async->data.apc_context, status, total ); add_async_completion( async, async->data.apc_context, status, total );