commit dd81ac50a974d513163f93a35e4071e746a6a260
author Alexandre Julliard <julliard@winehq.org> Thu Feb 24 17:06:31 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Feb 24 17:06:31 2005 +0000
tree a86d6711bc840a630764a8000391da6362bebf10
parent 91fc881d1f0c7603e66656834fedba758f49c04c

Convert async I/O queues to standard lists.

server/sock.c

diff --git a/server/sock.c b/server/sock.c
index 9a4ae79..d29233c 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -81,8 +81,8 @@
     obj_handle_t        wparam;      /* message wparam (socket handle) */
     int                 errors[FD_MAX_EVENTS]; /* event errors */
     struct sock        *deferred;    /* socket that waits for a deferred accept */
-    struct async       *read_q;      /* Queue for asynchronous reads */
-    struct async       *write_q;     /* Queue for asynchronous writes */
+    struct list         read_q;      /* queue for asynchronous reads */
+    struct list         write_q;     /* queue for asynchronous writes */
 };
 
 static void sock_dump( struct object *obj, int verbose );
@@ -237,16 +237,16 @@
 
     if ( sock->flags & WSA_FLAG_OVERLAPPED )
     {
-        if ( pollev & (POLLIN|POLLPRI) && sock->read_q )
+        if ( pollev & (POLLIN|POLLPRI) && !list_empty( &sock->read_q ))
         {
             if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock );
-            async_terminate( sock->read_q, STATUS_ALERTED );
+            async_terminate_head( &sock->read_q, STATUS_ALERTED );
             async_active = 1;
         }
-        if ( pollev & POLLOUT && sock->write_q )
+        if ( pollev & POLLOUT && !list_empty( &sock->write_q ))
         {
             if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock );
-            async_terminate( sock->write_q, STATUS_ALERTED );
+            async_terminate_head( &sock->write_q, STATUS_ALERTED );
             async_active = 1;
         }
     }
@@ -466,9 +466,9 @@
         /* listening, wait for readable */
         return (sock->hmask & FD_ACCEPT) ? 0 : POLLIN;
 
-    if (mask & (FD_READ) || (sock->flags & WSA_FLAG_OVERLAPPED && sock->read_q))
+    if (mask & (FD_READ) || (sock->flags & WSA_FLAG_OVERLAPPED && !list_empty( &sock->read_q )))
         ev |= POLLIN | POLLPRI;
-    if (mask & FD_WRITE || (sock->flags & WSA_FLAG_OVERLAPPED && sock->write_q))
+    if (mask & FD_WRITE || (sock->flags & WSA_FLAG_OVERLAPPED && !list_empty( &sock->write_q )))
         ev |= POLLOUT;
     /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */
     if ( sock->type == SOCK_STREAM && ( sock->mask & ~sock->hmask & FD_CLOSE) )
@@ -496,9 +496,9 @@
                               int type, int count )
 {
     struct sock *sock = get_fd_user( fd );
-    struct async **head;
+    struct list *queue;
     int pollev;
-    
+
     assert( sock->obj.ops == &sock_ops );
 
     if ( !(sock->flags & WSA_FLAG_OVERLAPPED) )
@@ -510,11 +510,11 @@
     switch (type)
     {
     case ASYNC_TYPE_READ:
-        head = &sock->read_q;
+        queue = &sock->read_q;
         sock->hmask &= ~FD_CLOSE;
         break;
     case ASYNC_TYPE_WRITE:
-        head = &sock->write_q;
+        queue = &sock->write_q;
         break;
     default:
         set_error( STATUS_INVALID_PARAMETER );
@@ -528,7 +528,7 @@
     }
     else
     {
-        if (!create_async( fd, current, 0, head, apc, user, iosb ))
+        if (!create_async( fd, current, 0, queue, apc, user, iosb ))
             return;
     }
 
@@ -608,10 +608,8 @@
         release_object( sock );
         return NULL;
     }
-    if (sock->flags & WSA_FLAG_OVERLAPPED)
-    {
-        sock->read_q = sock->write_q = NULL;
-    }
+    list_init( &sock->read_q );
+    list_init( &sock->write_q );
     sock_reselect( sock );
     clear_error();
     return &sock->obj;
@@ -682,10 +680,8 @@
             release_object( sock );
             return NULL;
         }
-        if ( acceptsock->flags & WSA_FLAG_OVERLAPPED )
-        {
-            acceptsock->read_q = acceptsock->write_q = NULL;
-        }
+        list_init( &acceptsock->read_q );
+        list_init( &acceptsock->write_q );
     }
     clear_error();
     sock->pmask &= ~FD_ACCEPT;