[PATCH v2 4/6] server: Continuously poll on queue fd for driver events.

[Rémi Bernon]

From: Rémi Bernon

---
 server/queue.c | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/server/queue.c b/server/queue.c
index 2d36e1568c0..7ae58bc2b2e 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -152,7 +152,6 @@ struct hotkey

static void msg_queue_dump( struct object *obj, int verbose );
 static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry );
-static void msg_queue_remove_queue( struct object *obj, struct wait_queue_entry *entry );
 static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry );
 static void msg_queue_destroy( struct object *obj );
 static void msg_queue_poll_event( struct fd *fd, int event );
@@ -166,7 +165,7 @@ static const struct object_ops msg_queue_ops =
     &no_type,                  /* type */
     msg_queue_dump,            /* dump */
     msg_queue_add_queue,       /* add_queue */
-    msg_queue_remove_queue,    /* remove_queue */
+    remove_queue,              /* remove_queue */
     msg_queue_signaled,        /* signaled */
     no_satisfied,              /* satisfied */
     no_signal,                 /* signal */
@@ -1307,33 +1306,10 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent
         return 0;
     }

-    if (queue->fd)
-    {
-        if (check_fd_events( queue->fd, POLLIN ))
-            set_queue_bits( queue, QS_DRIVER );
-        else
-        {
-            clear_queue_bits( queue, QS_DRIVER );
-            set_fd_events( queue->fd, POLLIN );
-        }
-    }
     add_queue( obj, entry );
     return 1;
 }

-static void msg_queue_remove_queue(struct object *obj, struct wait_queue_entry *entry )
-{
-    struct msg_queue *queue = (struct msg_queue *)obj;
-
-    remove_queue( obj, entry );
-    if (queue->fd)
-    {
-        /* after waiting, assume that all events will be processed */
-        clear_queue_bits( queue, QS_DRIVER );
-        set_fd_events( queue->fd, 0 );
-    }
-}
-
 static void msg_queue_dump( struct object *obj, int verbose )
 {
     struct msg_queue *queue = (struct msg_queue *)obj;
@@ -3141,7 +3117,10 @@ DECL_HANDLER(set_queue_fd)
     if ((unix_fd = get_file_unix_fd( file )) != -1)
     {
         if ((unix_fd = dup( unix_fd )) != -1)
+        {
             queue->fd = create_anonymous_fd( &msg_queue_fd_ops, unix_fd, &queue->obj, 0 );
+            set_fd_events( queue->fd, POLLIN );
+        }
         else
             file_set_error();
     }
@@ -3161,8 +3140,8 @@ DECL_HANDLER(set_queue_mask)
     if (req->poll_events)
     {
         if (!queue->fd) return;
-        if (check_fd_events( queue->fd, POLLIN )) set_queue_bits( queue, QS_DRIVER );
-        else clear_queue_bits( queue, QS_DRIVER );
+        clear_queue_bits( queue, QS_DRIVER );
+        set_fd_events( queue->fd, POLLIN );
         return;
     }