Changeset 959b7ec in mainline for uspace/lib/display/src

Timestamp:

2019-11-06T18:10:54Z (6 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/lib/display/src

Files:

• disp_srv.c (modified) (2 diffs)
• display.c (modified) (2 diffs)

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);