Changeset 613d644 in mainline for uspace/srv

Timestamp:

2014-08-26T15:30:15Z (11 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/srv

Files:

• audio/hound/main.c (modified) (1 diff)
• bd/sata_bd/sata_bd.c (modified) (1 diff)
• devman/driver.c (modified) (2 diffs)
• hid/isdv4_tablet/main.c (modified) (1 diff)
• hid/remcons/remcons.c (modified) (2 diffs)
• hid/rfb/main.c (modified) (1 diff)
• net/ethip/ethip.c (modified) (1 diff)
• net/inetsrv/inetsrv.c (modified) (1 diff)
• net/loopip/loopip.c (modified) (1 diff)
• net/nconfsrv/nconfsrv.c (modified) (1 diff)
• net/slip/slip.c (modified) (1 diff)
• ns/ns.c (modified) (1 diff)
• ns/task.c (modified) (6 diffs)
• ns/task.h (modified) (1 diff)
• taskmon/taskmon.c (modified) (1 diff)

uspace/srv/audio/hound/main.c

@@ -43 +43 @@
 #include <hound/server.h>
 #include <hound/protocol.h>
+#include <task.h>
 
 #include "hound.h"

uspace/srv/bd/sata_bd/sata_bd.c

@@ -45 +45 @@
 #include <loc.h>
 #include <macros.h>
+#include <task.h>
 
 #include <ahci_iface.h>

uspace/srv/devman/driver.c

@@ -40 +40 @@
 #include <str_error.h>
 #include <stdio.h>
+#include <task.h>
 
 #include "dev.h"
@@ -290 +291 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "start_driver(drv=\"%s\")", drv->name);
         
-        rc = task_spawnl(NULL, drv->binary_path, drv->binary_path, NULL);
+        rc = task_spawnl(NULL, NULL, drv->binary_path, drv->binary_path, NULL);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Spawning driver `%s' (%s) failed: %s.",

uspace/srv/hid/isdv4_tablet/main.c

@@ -36 +36 @@
 #include <ipc/mouseev.h>
 #include <inttypes.h>
+#include <task.h>
 
 #include "isdv4.h"

uspace/srv/hid/remcons/remcons.c

@@ -226 +226 @@
         
         task_id_t task;
-        int rc = task_spawnl(&task, APP_GETTERM, APP_GETTERM, user->service_name,
+        task_wait_t wait;
+        int rc = task_spawnl(&task, &wait, APP_GETTERM, APP_GETTERM, user->service_name,
             "/loc", "--msg", "--", APP_SHELL, NULL);
         if (rc != EOK) {
@@ -246 +247 @@
         task_exit_t task_exit;
         int task_retval;
-        task_wait(task, &task_exit, &task_retval);
+        task_wait(&wait, &task_exit, &task_retval);
         telnet_user_log(user, "%s terminated %s, exit code %d.", APP_GETTERM,
             task_exit == TASK_EXIT_NORMAL ? "normally" : "unexpectedly",

uspace/srv/hid/rfb/main.c

@@ -35 +35 @@
 #include <inttypes.h>
 #include <io/log.h>
+#include <task.h>
 
 #include <abi/fb/visuals.h>

uspace/srv/net/ethip/ethip.c

@@ -44 +44 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <task.h>
 #include "arp.h"
 #include "ethip.h"

uspace/srv/net/inetsrv/inetsrv.c

@@ -46 +46 @@
 #include <stdlib.h>
 #include <sys/types.h>
+#include <task.h>
 #include "addrobj.h"
 #include "icmp.h"

uspace/srv/net/loopip/loopip.c

@@ -44 +44 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <task.h>
 
 #define NAME  "loopip"

uspace/srv/net/nconfsrv/nconfsrv.c

@@ -48 +48 @@
 #include <stdlib.h>
 #include <sys/types.h>
+#include <task.h>
 #include "iplink.h"
 #include "nconfsrv.h"

uspace/srv/net/slip/slip.c

@@ -43 +43 @@
 #include <io/log.h>
 #include <errno.h>
+#include <task.h>
 
 #define NAME            "slip"

uspace/srv/ns/ns.c

@@ -66 +66 @@
         while (true) {
                 process_pending_conn();
-                process_pending_wait();
                 
                 ipc_call_t call;

uspace/srv/ns/task.c

@@ -40 +40 @@
 #include <macros.h>
 #include <malloc.h>
+#include <types/task.h>
 #include "task.h"
 #include "ns.h"
 
-
-/* TODO:
- *
- * As there is currently no convention that each task has to be waited
- * for, the NS can leak memory because of the zombie tasks.
- *
- */
 
 /** Task hash table item. */
@@ -195 +189 @@
                 }
                 
-                hash_table_remove(&task_hash_table, &pr->id);
                 list_remove(&pr->link);
                 free(pr);
@@ -204 +197 @@
 void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid)
 {
-        sysarg_t retval;
-        task_exit_t texit;
-        bool remove = false;
-        
         ht_link_t *link = hash_table_find(&task_hash_table, &id);
         hashed_task_t *ht = (link != NULL) ?
@@ -218 +207 @@
         }
         
-        if (!ht->finished) {
-                /* Add to pending list */
-                pending_wait_t *pr =
-                    (pending_wait_t *) malloc(sizeof(pending_wait_t));
-                if (!pr) {
-                        retval = ENOMEM;
-                        goto out;
-                }
-                
-                link_initialize(&pr->link);
-                pr->id = id;
-                pr->callid = callid;
-                list_append(&pr->link, &pending_wait);
+        if (ht->finished) {
+                task_exit_t texit = ht->have_rval ? TASK_EXIT_NORMAL :
+                    TASK_EXIT_UNEXPECTED;
+                ipc_answer_2(callid, EOK, texit, ht->retval);
                 return;
         }
         
-        remove = true;
-        retval = EOK;
-        
-out:
-        if (!(callid & IPC_CALLID_NOTIFICATION)) {
-                texit = ht->have_rval ? TASK_EXIT_NORMAL : TASK_EXIT_UNEXPECTED;
-                ipc_answer_2(callid, retval, texit, ht->retval);
-        }
-        if (remove)
-                hash_table_remove_item(&task_hash_table, link);
+        /* Add to pending list */
+        pending_wait_t *pr =
+            (pending_wait_t *) malloc(sizeof(pending_wait_t));
+        if (!pr) {
+                if (!(callid & IPC_CALLID_NOTIFICATION))
+                        ipc_answer_0(callid, ENOMEM);
+                return;
+        }
+        
+        link_initialize(&pr->link);
+        pr->id = id;
+        pr->callid = callid;
+        list_append(&pr->link, &pending_wait);
 }
 
@@ -314 +297 @@
         ht->retval = IPC_GET_ARG1(*call);
         
+        process_pending_wait();
+        
         return EOK;
 }
@@ -336 +321 @@
         ht->finished = true;
         
+        process_pending_wait();
+        hash_table_remove(&task_hash_table, &id);
+        
         return EOK;
 }

uspace/srv/ns/task.h

@@ -35 +35 @@
 
 #include <ipc/common.h>
-#include <task.h>
+#include <abi/proc/task.h>
 
 extern int task_init(void);

uspace/srv/taskmon/taskmon.c

@@ -82 +82 @@
 
                 printf(NAME ": Executing %s -c %s -t %s\n", fname, dump_fname, s_taskid);
-                rc = task_spawnl(NULL, fname, fname, "-c", dump_fname, "-t", s_taskid,
+                rc = task_spawnl(NULL, NULL, fname, fname, "-c", dump_fname, "-t", s_taskid,
                     NULL);
         } else {
                 printf(NAME ": Executing %s -t %s\n", fname, s_taskid);
-                rc = task_spawnl(NULL, fname, fname, "-t", s_taskid, NULL);
+                rc = task_spawnl(NULL, NULL, fname, fname, "-t", s_taskid, NULL);
         }