Changeset 55fe220 in mainline

Timestamp:

2019-08-07T04:56:41Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

d4ec49e

Parents:

5044114

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-12 22:21:42)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 04:56:41)

Message:

taskman: Modify existing callers of task_wait API
Conflicts:

uspace/app/bdsh/exec.c
uspace/app/getterm/getterm.c
uspace/app/sbi/src/os/helenos.c
uspace/app/vlaunch/vlaunch.c
uspace/lib/pcut/src/os/helenos.c
uspace/srv/hid/remcons/remcons.c

Location:

uspace

Files:

• app/bdsh/exec.c (modified) (1 diff)
• app/getterm/getterm.c (modified) (2 diffs)
• app/sbi/src/os/helenos.c (modified) (2 diffs)
• app/vlaunch/vlaunch.c (modified) (2 diffs)
• lib/pcut/src/os/helenos.c (modified) (1 diff)
• srv/hid/remcons/remcons.c (modified) (1 diff)

uspace/app/bdsh/exec.c

@@ -141 +141 @@
         }
 
+        task_wait_set(&twait, TASK_WAIT_EXIT | TASK_WAIT_RETVAL);
         rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv,
             file_handles[0], file_handles[1], file_handles[2]);

uspace/app/getterm/getterm.c

@@ -169 +169 @@
         task_id_t id;
         task_wait_t twait;
+        task_wait_set(&twait, TASK_WAIT_EXIT);
+        errno_t rc = task_spawnv(&id, &twait, cmd, (const char *const *) args);
 
-        errno_t rc = task_spawnv(&id, &twait, cmd, (const char *const *) args);
         if (rc != EOK) {
                 printf("%s: Error spawning %s (%s)\n", APP_NAME, cmd,
@@ -176 +177 @@
                 return rc;
         }
-
-        task_exit_t texit;
-        int retval;
-        rc = task_wait(&twait, &texit, &retval);
+        
+        rc = task_wait(&twait, NULL, NULL);
         if (rc != EOK) {
                 printf("%s: Error waiting for %s (%s)\n", APP_NAME, cmd,

uspace/app/sbi/src/os/helenos.c

@@ -255 +255 @@
         int retval;
 
+        task_wait_set(&twait, TASK_WAIT_EXIT);
         rc = task_spawnv(&tid, &twait, cmd[0], (char const *const *) cmd);
         if (rc != EOK) {
@@ -263 +264 @@
 
         /* XXX Handle exit status and return value. */
-        rc = task_wait(&twait, &texit, &retval);
+        rc = task_wait(&twait, NULL, NULL);
         (void) rc;
 

uspace/app/vlaunch/vlaunch.c

@@ -66 +66 @@
         task_id_t id;
         task_wait_t wait;
+        task_wait_set(&wait, TASK_WAIT_RETVAL);
         errno_t rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
         if (rc != EOK) {
@@ -72 +73 @@
                 return -1;
         }
-
-        task_exit_t texit;
+        
         int retval;
-        rc = task_wait(&wait, &texit, &retval);
-        if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
+        rc = task_wait(&wait, NULL, &retval);
+        if ((rc != EOK)) {
                 printf("%s: Error retrieving retval from %s (%s)\n", NAME,
                     app, str_error(rc));

uspace/lib/pcut/src/os/helenos.c

@@ -176 +176 @@
 
         task_wait_t test_task_wait;
+        task_wait_set(&test_task_wait, TASK_WAIT_EXIT | TASK_WAIT_RETVAL);
         rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments,
             fileno(stdin), tempfile, tempfile);

uspace/srv/hid/remcons/remcons.c

@@ -239 +239 @@
         task_id_t task;
         task_wait_t wait;
+        task_wait_set(&wait, TASK_WAIT_EXIT | TASK_WAIT_RETVAL);
         errno_t rc = task_spawnl(&task, &wait, APP_GETTERM, APP_GETTERM, user->service_name,
             "/loc", "--msg", "--", APP_SHELL, NULL);