Changeset c632c96 in mainline

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

39ab17c

Parents:

f59212cc

git-author:

Jiri Svoboda <jiri@…> (2021-10-20 22:22:04)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Unmap and clear console before executing a binary

Fixes running edit, nav, improves fdisk, etc.

Location:

uspace

Files:

• app/nav/panel.c (modified) (2 diffs)
• lib/congfx/include/congfx/console.h (modified) (1 diff)
• lib/congfx/src/console.c (modified) (1 diff)
• lib/ui/include/ui/ui.h (modified) (1 diff)
• lib/ui/src/ui.c (modified) (2 diffs)
• lib/ui/test/ui.c (modified) (1 diff)

uspace/app/nav/panel.c

@@ -1079 +1079 @@
         int retval;
         errno_t rc;
+        ui_t *ui;
 
         /* It's not a directory */
@@ -1085 +1086 @@
         assert(entry->svc == 0);
 
+        ui = ui_window_get_ui(panel->window);
+
+        /* Free up and clean console for the child task. */
+        rc = ui_suspend(ui);
+        if (rc != EOK)
+                return rc;
+
         rc = task_spawnl(&id, &wait, entry->name, entry->name, NULL);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         rc = task_wait(&wait, &texit, &retval);
         if ((rc != EOK) || (texit != TASK_EXIT_NORMAL))
+                goto error;
+
+        /* Resume UI operation */
+        rc = ui_resume(ui);
+        if (rc != EOK)
                 return rc;
 
         (void) ui_paint(ui_window_get_ui(panel->window));
         return EOK;
+error:
+        (void) ui_resume(ui);
+        (void) ui_paint(ui_window_get_ui(panel->window));
+        return rc;
 }
 

uspace/lib/congfx/include/congfx/console.h

@@ -47 +47 @@
 extern errno_t console_gc_create(console_ctrl_t *, FILE *, console_gc_t **);
 extern errno_t console_gc_delete(console_gc_t *);
+extern errno_t console_gc_suspend(console_gc_t *);
+extern errno_t console_gc_resume(console_gc_t *);
 extern gfx_context_t *console_gc_get_ctx(console_gc_t *);
 

uspace/lib/congfx/src/console.c

@@ -281 +281 @@
 }
 
+/** Free up console for other users, suspending GC operation.
+ *
+ * @param cgc Console GC
+ * @return EOK on success or an error code
+ */
+errno_t console_gc_suspend(console_gc_t *cgc)
+{
+        console_unmap(cgc->con, cgc->buf);
+        cgc->buf = NULL;
+
+        console_clear(cgc->con);
+        console_cursor_visibility(cgc->con, true);
+        return EOK;
+}
+
+/** Resume GC operation after suspend.
+ *
+ * @param cgc Console GC
+ * @return EOK on success or an error code
+ */ 
+errno_t console_gc_resume(console_gc_t *cgc)
+{
+        errno_t rc;
+
+        console_clear(cgc->con);
+
+        rc = console_map(cgc->con, cgc->rect.p1.x, cgc->rect.p1.y, &cgc->buf);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** Get generic graphic context from console GC.
  *

uspace/lib/ui/include/ui/ui.h

@@ -52 +52 @@
 extern bool ui_is_textmode(ui_t *);
 extern bool ui_is_fullscreen(ui_t *);
+extern errno_t ui_suspend(ui_t *);
+extern errno_t ui_resume(ui_t *);
 
 #endif

uspace/lib/ui/src/ui.c

@@ -40 +40 @@
 #include <fibril.h>
 #include <gfx/color.h>
+#include <gfx/cursor.h>
 #include <gfx/render.h>
 #include <io/console.h>
@@ -355 +356 @@
 }
 
+/** Free up console for other users.
+ *
+ * Release console resources for another application (that the current
+ * task is starting). After the other application finishes, resume
+ * operation with ui_resume(). No calls to UI must happen inbetween
+ * and no events must be processed (i.e. the calling function must not
+ * return control to UI.
+ *
+ * @param ui UI
+ * @return EOK on success or an error code
+ */
+errno_t ui_suspend(ui_t *ui)
+{
+        if (ui->cgc == NULL)
+                return EOK;
+
+        return console_gc_suspend(ui->cgc);
+}
+
+/** Resume suspended UI.
+ *
+ * Reclaim console resources (after child application has finished running)
+ * and restore UI operation previously suspended by calling ui_suspend().
+ *
+ * @param ui UI
+ * @return EOK on success or an error code
+ */
+errno_t ui_resume(ui_t *ui)
+{
+        errno_t rc;
+
+        if (ui->cgc == NULL)
+                return EOK;
+
+        rc = console_gc_resume(ui->cgc);
+        if (rc != EOK)
+                return rc;
+
+        return gfx_cursor_set_visible(console_gc_get_ctx(ui->cgc), false);
+}
+
 /** Terminate user interface.
  *

uspace/lib/ui/test/ui.c

@@ -67 +67 @@
 {
         ui_destroy(NULL);
+}
+
+/** ui_suspend() / ui_resume() do nothing if we don't have a console */
+PCUT_TEST(suspend_resume)
+{
+        ui_t *ui = NULL;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(ui);
+
+        rc = ui_suspend(ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        rc = ui_resume(ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_destroy(ui);
 }