Changeset 1c635d6 in mainline for uspace/app/init/init.c

Timestamp:

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

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

613d644

Parents:

df7f5cea

Message:

Do not hold a task's return value after it has disconnected.

Holding the task's return value meant that if nobody waited
for task's result, it polluted NS's memory. This was apparently
done because of a race between spawning a task and waiting for it.

We solve this problem in another way: ns discards the return value
as soon as the task disconnects from it. This typically happens
when the task finishes its execution. In order to avoid the race,
we send the wait request to ns while spawning the task (i.e. when
we talk to the loader), but before we allow the loaded program
to run.

Fixes #132

File:

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

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)