Changes in uspace/srv/ns/task.c [7b616e2:234f47e] in mainline

File:

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

uspace/srv/ns/task.c

@@ -32 +32 @@
  */
 
+#include <ipc/ipc.h>
 #include <adt/hash_table.h>
-#include <async.h>
 #include <stdbool.h>
 #include <errno.h>
@@ -182 +182 @@
                         continue;
                 
-                texit = ht->have_rval ? TASK_EXIT_NORMAL :
-                    TASK_EXIT_UNEXPECTED;
-                async_answer_2(pr->callid, EOK, texit, ht->retval);
+                if (!(pr->callid & IPC_CALLID_NOTIFICATION)) {
+                        texit = ht->have_rval ? TASK_EXIT_NORMAL :
+                            TASK_EXIT_UNEXPECTED;
+                        ipc_answer_2(pr->callid, EOK, texit,
+                            ht->retval);
+                }
                 
                 list_remove(&pr->link);
@@ -200 +203 @@
         if (ht == NULL) {
                 /* No such task exists. */
-                async_answer_0(callid, ENOENT);
+                ipc_answer_0(callid, ENOENT);
                 return;
         }
@@ -207 +210 @@
                 task_exit_t texit = ht->have_rval ? TASK_EXIT_NORMAL :
                     TASK_EXIT_UNEXPECTED;
-                async_answer_2(callid, EOK, texit, ht->retval);
+                ipc_answer_2(callid, EOK, texit, ht->retval);
                 return;
         }
@@ -215 +218 @@
             (pending_wait_t *) malloc(sizeof(pending_wait_t));
         if (!pr) {
-                async_answer_0(callid, ENOMEM);
+                if (!(callid & IPC_CALLID_NOTIFICATION))
+                        ipc_answer_0(callid, ENOMEM);
                 return;
         }
@@ -278 +282 @@
 int ns_task_retval(ipc_call_t *call)
 {
-        task_id_t id = call->in_task_id;
-        
-        ht_link_t *link = hash_table_find(&task_hash_table, &id);
-        hashed_task_t *ht = (link != NULL) ?
-            hash_table_get_inst(link, hashed_task_t, link) : NULL;
-        
-        if ((ht == NULL) || (ht->finished))
-                return EINVAL;
-        
-        ht->finished = true;
-        ht->have_rval = true;
-        ht->retval = IPC_GET_ARG1(*call);
-        
-        process_pending_wait();
-        
-        return EOK;
-}
-
-int ns_task_disconnect(ipc_call_t *call)
-{
         task_id_t id;
         int rc = get_id_by_phone(call->in_phone_hash, &id);
@@ -303 +287 @@
                 return rc;
         
+        ht_link_t *link = hash_table_find(&task_hash_table, &id);
+        hashed_task_t *ht = (link != NULL) ?
+            hash_table_get_inst(link, hashed_task_t, link) : NULL;
+        
+        if ((ht == NULL) || (ht->finished))
+                return EINVAL;
+        
+        ht->finished = true;
+        ht->have_rval = true;
+        ht->retval = IPC_GET_ARG1(*call);
+        
+        process_pending_wait();
+        
+        return EOK;
+}
+
+int ns_task_disconnect(ipc_call_t *call)
+{
+        task_id_t id;
+        int rc = get_id_by_phone(call->in_phone_hash, &id);
+        if (rc != EOK)
+                return rc;
+        
         /* Delete from phone-to-id map. */
         hash_table_remove(&phone_to_id, &call->in_phone_hash);