Changeset e422ff6 in mainline

Timestamp:

2019-11-06T21:10:53Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bfddc62

Parents:

959b7ec

Message:

ds_client_get_event() should not block if no events are pending

This is a relic of older design that didn't use pending event notification
via callback session.

Location:

uspace/srv/hid/display

Files:

• client.c (modified) (6 diffs)
• test/client.c (modified) (1 diff)
• types/display/client.h (modified) (2 diffs)

uspace/srv/hid/display/client.c

@@ -34 +34 @@
  */
 
+#include <adt/list.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -58 +59 @@
 
         list_initialize(&client->windows);
-        prodcons_initialize(&client->events);
+        list_initialize(&client->events);
         client->cb = cb;
         client->cb_arg = cb_arg;
@@ -162 +163 @@
 /** Get next event from client event queue.
  *
- * This function blocks until an event is available.
- *
- * @param wnd Window
+ * @param client Client
+ * @param ewindow Place to store pointer to window receiving the event
+ * @param event Place to store event
  * @return Graphic context
  */
@@ -173 +174 @@
         ds_window_ev_t *wevent;
 
-        link = prodcons_consume(&client->events);
+        link = list_first(&client->events);
+        if (link == NULL)
+                return ENOENT;
         wevent = list_get_instance(link, ds_window_ev_t, levents);
 
@@ -182 +185 @@
 }
 
+/** Post keyboard event to the client's message queue.
+ *
+ * @param client Client
+ * @param ewindow Window that the message is targetted to
+ * @param event Event
+ *
+ * @return EOK on success or an error code
+ */
 errno_t ds_client_post_kbd_event(ds_client_t *client, ds_window_t *ewindow,
     kbd_event_t *event)
@@ -193 +204 @@
         wevent->window = ewindow;
         wevent->event.kbd_event = *event;
-        prodcons_produce(&client->events, &wevent->levents);
+        list_append(&wevent->levents, &client->events);
 
         /* Notify the client */

uspace/srv/hid/display/test/client.c

@@ -180 +180 @@
         PCUT_ASSERT_FALSE(called_cb);
 
-#if 0
-        // XXX Forgot to change ds_client_get_event not to block
         rc = ds_client_get_event(client, &rwindow, &revent);
         PCUT_ASSERT_ERRNO_VAL(ENOENT, rc);
-#endif
 
         rc = ds_client_post_kbd_event(client, wnd, &event);

uspace/srv/hid/display/types/display/client.h

@@ -38 +38 @@
 
 #include <adt/list.h>
-#include <adt/prodcons.h>
 
 typedef sysarg_t ds_wnd_id_t;
@@ -60 +59 @@
         list_t windows;
         /** Event queue (of ds_window_ev_t) */
-        prodcons_t events;
+        list_t events;
 } ds_client_t;