Changeset ce862ac in mainline

Timestamp:

2021-11-02T18:49:52Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b48e680f

Parents:

24c452b3

Message:

Terminate terminal if the child task has terminated

Try saying that three times quickly.

Location:

uspace/app/terminal

Files:

• main.c (modified) (2 diffs)
• terminal.c (modified) (6 diffs)
• terminal.h (modified) (3 diffs)

uspace/app/terminal/main.c

@@ -33 +33 @@
  */
 
+#include <ui/ui.h>
 #include <stdio.h>
-#include <task.h>
-#include <ui/ui.h>
 #include "terminal.h"
 
@@ -98 +97 @@
                 return 1;
 
-        task_retval(0);
-        async_manager();
+        ui_run(terminal->ui);
+
+        terminal_destroy(terminal);
         return 0;
 }

uspace/app/terminal/terminal.c

@@ -41 +41 @@
 #include <fbfont/font-8x16.h>
 #include <io/chargrid.h>
+#include <fibril.h>
 #include <gfx/bitmap.h>
 #include <gfx/context.h>
@@ -128 +129 @@
 };
 
+static errno_t terminal_wait_fibril(void *);
+
 static terminal_t *srv_to_terminal(con_srv_t *srv)
 {
@@ -133 +136 @@
 }
 
-static void getterm(const char *svc, const char *app)
-{
-        task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
+static errno_t getterm(task_wait_t *wait, const char *svc, const char *app)
+{
+        return task_spawnl(NULL, wait, APP_GETTERM, APP_GETTERM, svc,
             LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
 }
@@ -804 +807 @@
         terminal_t *term = (terminal_t *) arg;
 
-        (void) term;
-
-        // XXX This is not really a clean way of terminating
-        exit(0);
+        ui_quit(term->ui);
 }
 
@@ -1014 +1014 @@
 
         list_append(&term->link, &terms);
-        getterm(vc, command);
+        rc = getterm(&term->wait, vc, command);
+        if (rc != EOK)
+                goto error;
+
+        term->wfid = fibril_create(terminal_wait_fibril, term);
+        if (term->wfid == 0)
+                goto error;
+
+        fibril_add_ready(term->wfid);
 
         term->is_focused = true;
@@ -1040 +1048 @@
 }
 
+static errno_t terminal_wait_fibril(void *arg)
+{
+        terminal_t *term = (terminal_t *)arg;
+        task_exit_t texit;
+        int retval;
+
+        /*
+         * XXX There is no way to break the sleep if the task does not
+         * exit.
+         */
+        (void) task_wait(&term->wait, &texit, &retval);
+        ui_quit(term->ui);
+        return EOK;
+}
+
 /** @}
  */

uspace/app/terminal/terminal.h

@@ -38 +38 @@
 #define TERMINAL_H
 
+#include <adt/prodcons.h>
 #include <errno.h>
+#include <fibril.h>
 #include <fibril_synch.h>
 #include <gfx/bitmap.h>
@@ -46 +48 @@
 #include <io/con_srv.h>
 #include <loc.h>
-#include <adt/prodcons.h>
 #include <stdatomic.h>
 #include <str.h>
+#include <task.h>
 #include <ui/ui.h>
 #include <ui/window.h>
@@ -91 +93 @@
         service_id_t dsid;
         con_srvs_t srvs;
+
+        task_wait_t wait;
+        fid_t wfid;
 } terminal_t;