[PATCH 06/11] server: Remove "signaled" field from struct async.

[Jinoh Kang]

From: Jinoh Kang

---
 server/async.c | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/server/async.c b/server/async.c
index 666836b831e..5616407d6d6 100644
--- a/server/async.c
+++ b/server/async.c
@@ -74,7 +74,6 @@ struct async
     obj_handle_t         wait_handle;     /* pre-allocated wait handle */
     unsigned int         initial_status;  /* status returned from initial request */
     enum async_state     state;
-    unsigned int         signaled :1;
     unsigned int         pending :1;      /* request successfully queued, but pending */
     unsigned int         direct_result :1;/* a flag if we're passing result directly from request instead of APC  */
     unsigned int         alerted :1;      /* fd is signaled, but we are waiting for client-side I/O */
@@ -138,27 +137,22 @@ static int async_signaled( struct object *obj, struct wait_queue_entry *entry )
     {
     case ASYNC_INITIAL:
     case ASYNC_UNKNOWN_STATUS:
-        assert( async->signaled == 0 );
-        break;
+        return 0;
     case ASYNC_FINALIZING_SYNC:
         /* If direct_result, the client will "wait" on the async to signal completion. */
-        assert( async->signaled == async->direct_result );
-        break;
+        return async->direct_result;
     case ASYNC_IN_PROGRESS:
     case ASYNC_ALERTED:
     case ASYNC_FINALIZING_ASYNC:
         /* If nonblocking, the client will "wait" on the async to close it. */
-        assert( async->signaled == (!async->blocking) );
-        break;
+        return !async->blocking;
     case ASYNC_COMPLETED:
         /* If there is an open async handle, notify the waiter of completion. */
-        assert( async->signaled == 1 );
-        break;
+        return 1;
     default:
         assert( 0 );
-        break;
+        return 0;
     }
-    return async->signaled;
 }

static void async_satisfied( struct object *obj, struct wait_queue_entry *entry )
@@ -299,7 +293,6 @@ void async_terminate( struct async *async, unsigned int status )
     if (async->state == ASYNC_FINALIZING_SYNC ? async->direct_result :
         (async->state != ASYNC_UNKNOWN_STATUS && !async->blocking))
     {
-        async->signaled = 1;
         wake_up( &async->obj, 0 );
     }

@@ -400,7 +393,6 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da
     async->fd            = (struct fd *)grab_object( fd );
     async->initial_status = STATUS_PENDING;
     async->state         = ASYNC_INITIAL;
-    async->signaled      = 0;
     async->pending       = 1;
     async->wait_handle   = 0;
     async->direct_result = 0;
@@ -454,7 +446,6 @@ void async_wake_obj( struct async *async )
     async->state = ASYNC_IN_PROGRESS;
     if (!async->blocking)
     {
-        async->signaled = 1;
         wake_up( &async->obj, 0 );
     }
 }
@@ -533,7 +524,6 @@ obj_handle_t async_handoff( struct async *async, data_size_t *result, int force_
     if (async->iosb->status != STATUS_PENDING)
     {
         if (result) *result = async->iosb->result;
-        async->signaled = 1;
     }
     else
     {
@@ -676,7 +666,6 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota
         }

async->state = ASYNC_COMPLETED;
-        async->signaled = 1;
         wake_up( &async->obj, 0 );

async_call_completion_callback( async );