Changeset 9dcf472 in mainline for uspace/app/trace/trace.c

Timestamp:

2019-10-02T10:27:50Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5667dca

Parents:

2443ad8

git-author:

Jiri Svoboda <jiri@…> (2019-10-01 18:27:34)

git-committer:

Jiri Svoboda <jiri@…> (2019-10-02 10:27:50)

Message:

Trace should not wait for spawned task by ID

It can just use a task_wait_t.

File:

• uspace/app/trace/trace.c (modified) (6 diffs)

uspace/app/trace/trace.c

@@ -89 +89 @@
 
 static task_id_t task_id;
+static task_wait_t task_w;
 static bool task_wait_for;
 
@@ -113 +114 @@
         errno_t rc;
 
-        rc = task_spawnv_debug(&task_id, NULL, cmd_path,
+        rc = task_spawnv_debug(&task_id, &task_w, cmd_path,
             (const char *const *)cmd_args, &sess);
 
@@ -135 +136 @@
         errno_t rc;
         bool debug_started = false;
+        bool wait_set_up = false;
 
         if (sess == NULL) {
@@ -151 +153 @@
 
                 debug_started = true;
+
+                rc = task_setup_wait(task_id, &task_w);
+                if (rc != EOK) {
+                        printf("Error setting up wait for task termination.\n");
+                        goto error;
+                }
+
+                wait_set_up = true;
         }
 
@@ -161 +171 @@
         return EOK;
 error:
+        if (wait_set_up)
+                task_cancel_wait(&task_w);
         if (debug_started)
                 udebug_end(sess);
@@ -807 +819 @@
                 printf("Waiting for task to exit.\n");
 
-                rc = task_wait_task_id(task_id, &texit, &retval);
+                rc = task_wait(&task_w, &texit, &retval);
                 if (rc != EOK) {
                         printf("Failed waiting for task.\n");