Changeset 613d644 in mainline for uspace/app

Timestamp:

2014-08-26T15:30:15Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0b811da2, 2cc1ec0, da904f7

Parents:

cb1fd3e (diff), 1c635d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge fix for leaking task retvals in ns

Location:

uspace/app

Files:

• bdsh/exec.c (modified) (3 diffs)
• getterm/getterm.c (modified) (2 diffs)
• init/init.c (modified) (6 diffs)
• redir/redir.c (modified) (3 diffs)
• sbi/src/os/helenos.c (modified) (2 diffs)
• trace/trace.c (modified) (1 diff)
• viewer/viewer.c (modified) (1 diff)
• vlaunch/vlaunch.c (modified) (2 diffs)

uspace/app/bdsh/exec.c

@@ -97 +97 @@
 {
         task_id_t tid;
+        task_wait_t twait;
         task_exit_t texit;
         char *tmp;
@@ -121 +122 @@
         file_handles_p[i] = NULL;
 
-        rc = task_spawnvf(&tid, tmp, (const char **) argv, file_handles_p);
+        rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv, file_handles_p);
         free(tmp);
 
@@ -130 +131 @@
         }
         
-        rc = task_wait(tid, &texit, &retval);
+        rc = task_wait(&twait, &texit, &retval);
         if (rc != EOK) {
                 printf("%s: Failed waiting for command (%s)\n", progname,

uspace/app/getterm/getterm.c

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

uspace/app/init/init.c

@@ -172 +172 @@
         va_start(ap, path);
         task_id_t id;
-        int rc = task_spawn(&id, path, cnt, ap);
+        task_wait_t wait;
+        int rc = task_spawn(&id, &wait, path, cnt, ap);
         va_end(ap);
         
@@ -189 +190 @@
         task_exit_t texit;
         int retval;
-        rc = task_wait(id, &texit, &retval);
+        rc = task_wait(&wait, &texit, &retval);
         if (rc != EOK) {
                 printf("%s: Error waiting for %s (%s)\n", NAME, path,
@@ -253 +254 @@
         
         task_id_t id;
-        int rc = task_spawnl(&id, app, app, winreg, NULL);
+        task_wait_t wait;
+        int rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
         if (rc != EOK) {
                 printf("%s: Error spawning %s %s (%s)\n", NAME, app,
@@ -262 +264 @@
         task_exit_t texit;
         int retval;
-        rc = task_wait(id, &texit, &retval);
+        rc = task_wait(&wait, &texit, &retval);
         if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
                 printf("%s: Error retrieving retval from %s (%s)\n", NAME,
@@ -278 +280 @@
                     APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
                 
-                int rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, svc,
+                int rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
                     LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
                 if (rc != EOK)
@@ -287 +289 @@
                     APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
                 
-                int rc = task_spawnl(NULL, APP_GETTERM, APP_GETTERM, svc,
+                int rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
                     LOCFS_MOUNT_POINT, "--wait", "--", app, NULL);
                 if (rc != EOK)

uspace/app/redir/redir.c

@@ -75 +75 @@
 }
 
-static task_id_t spawn(int argc, char *argv[])
+static task_id_t spawn(task_wait_t *wait, int argc, char *argv[])
 {
         const char **args;
@@ -93 +93 @@
         args[argc] = NULL;
         
-        rc = task_spawnv(&id, argv[0], args);
+        rc = task_spawnv(&id, wait, argv[0], args);
         
         free(args);
@@ -152 +152 @@
          */
         setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
-        
-        task_id_t id = spawn(argc - i, argv + i);
+
+        task_wait_t wait;       
+        task_id_t id = spawn(&wait, argc - i, argv + i);
         
         if (id != 0) {
                 task_exit_t texit;
                 int retval;
-                task_wait(id, &texit, &retval);
+                task_wait(&wait, &texit, &retval);
                 
                 return retval;

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

@@ -250 +250 @@
 {
         task_id_t tid;
+        task_wait_t twait;
         task_exit_t texit;
         int rc, retval;
 
-        rc = task_spawnv(&tid, cmd[0], (char const * const *) cmd);
+        rc = task_spawnv(&tid, &twait, cmd[0], (char const * const *) cmd);
         if (rc != EOK) {
                 printf("Error: Failed spawning '%s' (%s).\n", cmd[0],
@@ -261 +262 @@
 
         /* XXX Handle exit status and return value. */
-        rc = task_wait(tid, &texit, &retval);
+        rc = task_wait(&twait, &texit, &retval);
         (void) rc;
 

uspace/app/trace/trace.c

@@ -876 +876 @@
                 printf("Waiting for task to exit.\n");
 
-                rc = task_wait(task_id, &texit, &retval);
+                rc = task_wait_task_id(task_id, &texit, &retval);
                 if (rc != EOK) {
                         printf("Failed waiting for task.\n");

uspace/app/viewer/viewer.c

@@ -44 +44 @@
 #include <surface.h>
 #include <codec/tga.h>
+#include <task.h>
 
 #define NAME  "viewer"

uspace/app/vlaunch/vlaunch.c

@@ -94 +94 @@
         
         task_id_t id;
-        int rc = task_spawnl(&id, app, app, winreg, NULL);
+        task_wait_t wait;
+        int rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
         if (rc != EOK) {
                 printf("%s: Error spawning %s %s (%s)\n", NAME, app,
@@ -103 +104 @@
         task_exit_t texit;
         int retval;
-        rc = task_wait(id, &texit, &retval);
+        rc = task_wait(&wait, &texit, &retval);
         if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
                 printf("%s: Error retrieving retval from %s (%s)\n", NAME,