Changeset 6e3a44a in mainline for uspace/app/trace/trace.c

Timestamp:

2009-07-21T22:18:49Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

9ad5b5cc

Parents:

5462a30

Message:

Wait for app to exit before returning from tracer.

File:

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

uspace/app/trace/trace.c

@@ -84 +84 @@
 static task_id_t task_id;
 static loader_t *task_ldr;
+static int task_wait_for;
 
 /** Combination of events/data to print. */
@@ -861 +862 @@
                                 task_id = strtol(*argv, &err_p, 10);
                                 task_ldr = NULL;
+                                task_wait_for = 0;
                                 if (*err_p) {
                                         printf("Task ID syntax error\n");
@@ -898 +900 @@
         }
         task_ldr = preload_task(*argv, argv, &task_id);
+        task_wait_for = 1;
 
         return 0;
@@ -905 +908 @@
 {
         int rc;
+        task_exit_t texit;
+        int retval;
 
         printf("System Call / IPC Tracer\n");
@@ -924 +929 @@
         printf("Connected to task %lld.\n", task_id);
 
-        if (task_ldr != NULL) {
+        if (task_ldr != NULL)
                 program_run();
-        }
 
         cev_fibril_start();
         trace_task(task_id);
 
+        if (task_wait_for) {
+                printf("Waiting for task to exit.\n");
+
+                rc = task_wait(task_id, &texit, &retval);
+                if (rc != EOK) {
+                        printf("Failed waiting for task.\n");
+                        return -1;
+                }
+
+                if (texit == TASK_EXIT_NORMAL) {
+                        printf("Task exited normally, return value %d.\n",
+                            retval);
+                } else {
+                        printf("Task exited unexpectedly.\n");
+                }
+        }
+
         return 0;
 }