Changeset 959b7ec in mainline

Timestamp:

2019-11-06T18:10:54Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e422ff6

Parents:

648e2ac

Message:

Start adding tests for libdisplay and fix display_close

So far we test display_open() and display_close().
display_conn was not closing the callback session, which led
to display_close waiting indefinitely.

Location:

uspace

Files:

• lib/display/include/disp_srv.h (modified) (1 diff)
• lib/display/include/types/display.h (modified) (1 diff)
• lib/display/meson.build (modified) (1 diff)
• lib/display/src/disp_srv.c (modified) (2 diffs)
• lib/display/src/display.c (modified) (2 diffs)
• lib/display/test/display.c (added)
• lib/display/test/main.c (added)
• srv/hid/display/main.c (modified) (1 diff)

uspace/lib/display/include/disp_srv.h

@@ -56 +56 @@
 
 extern void display_conn(ipc_call_t *, display_srv_t *);
+extern void display_srv_initialize(display_srv_t *);
 extern void display_srv_ev_pending(display_srv_t *);
 

uspace/lib/display/include/types/display.h

@@ -61 +61 @@
 } display_wnd_cb_t;
 
-typedef struct {
-        kbd_event_t kbd_event;
-} display_wnd_ev_t;
-
 /** Display window */
 typedef struct {

uspace/lib/display/meson.build

@@ -30 +30 @@
 src = files(
         'src/display.c',
-        'src/disp_srv.c'
+        'src/disp_srv.c',
 )
+
+test_src = files(
+        'test/display.c',
+        'test/main.c',
+)

uspace/lib/display/src/disp_srv.c

@@ -40 +40 @@
 #include <io/log.h>
 #include <ipc/display.h>
+#include <mem.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -169 +170 @@
                 }
         }
+
+        /* Hang up callback session */
+        if (srv->client_sess != NULL) {
+                async_hangup(srv->client_sess);
+                srv->client_sess = NULL;
+        }
+}
+
+/** Initialize display server structure
+ *
+ * @param srv Display server structure to initialize
+ */
+void display_srv_initialize(display_srv_t *srv)
+{
+        memset(srv, 0, sizeof(*srv));
 }
 

uspace/lib/display/src/display.c

@@ -29 +29 @@
 #include <async.h>
 #include <display.h>
+#include <display/event.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -57 +58 @@
                 return ENOMEM;
 
+        fibril_mutex_initialize(&display->lock);
+        fibril_condvar_initialize(&display->cv);
         list_initialize(&display->windows);
 

uspace/srv/hid/display/main.c

@@ -156 +156 @@
 
                 /* Set up protocol structure */
+                display_srv_initialize(&srv);
                 srv.ops = &display_srv_ops;
                 srv.arg = client;