Changes in uspace/srv/ns/task.c [166a1f57:234f47e] in mainline

File:

• uspace/srv/ns/task.c (modified) (8 diffs)

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. */
@@ -179 +173 @@
         
 loop:
-        list_foreach(pending_wait, cur) {
-                pending_wait_t *pr = list_get_instance(cur, pending_wait_t, link);
-                
+        list_foreach(pending_wait, link, pending_wait_t, pr) {
                 ht_link_t *link = hash_table_find(&task_hash_table, &pr->id);
                 if (!link)
@@ -197 +189 @@
                 }
                 
-                hash_table_remove(&task_hash_table, &pr->id);
-                list_remove(cur);
+                list_remove(&pr->link);
                 free(pr);
                 goto loop;
@@ -206 +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) ?
@@ -220 +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);
 }
 
 int ns_task_id_intro(ipc_call_t *call)
 {
-        
         task_id_t id = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call));
-
+        
         ht_link_t *link = hash_table_find(&phone_to_id, &call->in_phone_hash);
         if (link != NULL)
-                return EEXISTS;
+                return EEXIST;
         
         p2i_entry_t *entry = (p2i_entry_t *) malloc(sizeof(p2i_entry_t));
@@ -262 +242 @@
         
         hashed_task_t *ht = (hashed_task_t *) malloc(sizeof(hashed_task_t));
-        if (ht == NULL)
+        if (ht == NULL) {
+                free(entry);
                 return ENOMEM;
+        }
         
         /*
@@ -316 +298 @@
         ht->retval = IPC_GET_ARG1(*call);
         
+        process_pending_wait();
+        
         return EOK;
 }
@@ -338 +322 @@
         ht->finished = true;
         
+        process_pending_wait();
+        hash_table_remove(&task_hash_table, &id);
+        
         return EOK;
 }