Changeset be15256 in mainline

Timestamp:

2019-11-05T08:00:18Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b2d1df3

Parents:

b3c185b6

git-author:

Jiri Svoboda <jiri@…> (2019-10-04 19:00:15)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-05 08:00:18)

Message:

ds_client should not have reverse dependency on libdisplay's display_srv

Breaks layering and hampers testability

Location:

uspace/srv/hid/display

Files:

• client.c (modified) (4 diffs)
• client.h (modified) (1 diff)
• main.c (modified) (3 diffs)
• test/display.c (modified) (2 diffs)
• test/window.c (modified) (1 diff)
• types/display/client.h (modified) (2 diffs)

uspace/srv/hid/display/client.c

@@ -34 +34 @@
  */
 
-#include <disp_srv.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -44 +43 @@
  *
  * @param display Parent display
+ * @param cb Client callbacks
+ * @param cb_arg Callback argument
  * @param rclient Place to store pointer to new client.
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ds_client_create(ds_display_t *display, display_srv_t *srv,
-    ds_client_t **rclient)
+errno_t ds_client_create(ds_display_t *display, ds_client_cb_t *cb,
+    void *cb_arg, ds_client_t **rclient)
 {
         ds_client_t *client;
@@ -58 +59 @@
         list_initialize(&client->windows);
         prodcons_initialize(&client->events);
-        client->srv = srv;
+        client->cb = cb;
+        client->cb_arg = cb_arg;
 
         ds_display_add_client(display, client);
@@ -195 +197 @@
         /* Notify the client */
         // TODO Do not send more than once until client drains the queue
-        display_srv_ev_pending(client->srv);
+        client->cb->ev_pending(client->cb_arg);
 
         return EOK;

uspace/srv/hid/display/client.h

@@ -37 +37 @@
 #define CLIENT_H
 
-#include <disp_srv.h>
 #include "types/display/client.h"
 #include "types/display/display.h"
 
-extern errno_t ds_client_create(ds_display_t *, display_srv_t *, ds_client_t **);
+extern errno_t ds_client_create(ds_display_t *, ds_client_cb_t *, void *,
+    ds_client_t **);
 extern void ds_client_destroy(ds_client_t *);
 extern errno_t ds_client_add_window(ds_client_t *, ds_window_t *);

uspace/srv/hid/display/main.c

@@ -52 +52 @@
 
 static void display_client_conn(ipc_call_t *, void *);
+static void display_client_ev_pending(void *);
+
+static ds_client_cb_t display_client_cb = {
+        .ev_pending = display_client_ev_pending
+};
 
 static void display_kbd_event(void *arg, kbd_event_t *event)
@@ -59 +64 @@
         printf("display_kbd_event\n");
         ds_display_post_kbd_event(disp, event);
+}
+
+static void display_client_ev_pending(void *arg)
+{
+        display_srv_t *srv = (display_srv_t *) arg;
+        printf("display_client_ev_pending\n");
+        display_srv_ev_pending(srv);
 }
 
@@ -137 +149 @@
         if (svc_id != 0) {
                 /* Create client object */
-                rc = ds_client_create(disp, &srv, &client);
+                rc = ds_client_create(disp, &display_client_cb, &srv, &client);
                 if (rc != EOK) {
                         async_answer_0(icall, ENOMEM);

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

@@ -39 +39 @@
 PCUT_TEST_SUITE(display);
 
+static void test_ds_ev_pending(void *);
+
+static ds_client_cb_t test_ds_client_cb = {
+        .ev_pending = test_ds_ev_pending
+};
+
+static void test_ds_ev_pending(void *arg)
+{
+        printf("test_ds_ev_pending\n");
+}
+
+
 /** Display creation and destruction. */
 PCUT_TEST(display_create_destroy)
@@ -62 +74 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ds_client_create(disp, NULL, &client);
+        rc = ds_client_create(disp, &test_ds_client_cb, NULL, &client);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 

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

@@ -47 +47 @@
         errno_t rc;
 
-        rc = ds_client_create(NULL, NULL, &client);
+        rc = ds_client_create(NULL, NULL, NULL, &client);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 

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

@@ -39 +39 @@
 #include <adt/list.h>
 #include <adt/prodcons.h>
-#include <disp_srv.h>
 
 typedef sysarg_t ds_wnd_id_t;
+
+/** Display server client callbacks */
+typedef struct {
+        void (*ev_pending)(void *);
+} ds_client_cb_t;
 
 /** Display server client */
@@ -47 +51 @@
         /** Parent display */
         struct ds_display *display;
-        /** Display protocol per-connection structure */
-        display_srv_t *srv;
+        /** Callbacks */
+        ds_client_cb_t *cb;
+        /** Callback argument */
+        void *cb_arg;
         /** Link to @c display->clients */
         link_t lclients;