Changes in uspace/srv/ns/task.c [a35b458:eed4139] in mainline

File:

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

uspace/srv/ns/task.c

@@ -145 +145 @@
 typedef struct {
         link_t link;
-        task_id_t id;         /**< Task ID. */
-        ipc_callid_t callid;  /**< Call ID waiting for the connection */
+        task_id_t id;               ///< Task ID
+        cap_call_handle_t chandle;  ///< Call handle waiting for the connection
 } pending_wait_t;
 
@@ -184 +184 @@
                 texit = ht->have_rval ? TASK_EXIT_NORMAL :
                     TASK_EXIT_UNEXPECTED;
-                async_answer_2(pr->callid, EOK, texit, ht->retval);
+                async_answer_2(pr->chandle, EOK, texit, ht->retval);
 
                 list_remove(&pr->link);
@@ -192 +192 @@
 }
 
-void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid)
+void wait_for_task(task_id_t id, ipc_call_t *call, cap_call_handle_t chandle)
 {
         ht_link_t *link = hash_table_find(&task_hash_table, &id);
@@ -200 +200 @@
         if (ht == NULL) {
                 /* No such task exists. */
-                async_answer_0(callid, ENOENT);
+                async_answer_0(chandle, ENOENT);
                 return;
         }
@@ -207 +207 @@
                 task_exit_t texit = ht->have_rval ? TASK_EXIT_NORMAL :
                     TASK_EXIT_UNEXPECTED;
-                async_answer_2(callid, EOK, texit, ht->retval);
+                async_answer_2(chandle, EOK, texit, ht->retval);
                 return;
         }
@@ -215 +215 @@
             (pending_wait_t *) malloc(sizeof(pending_wait_t));
         if (!pr) {
-                async_answer_0(callid, ENOMEM);
+                async_answer_0(chandle, ENOMEM);
                 return;
         }
@@ -221 +221 @@
         link_initialize(&pr->link);
         pr->id = id;
-        pr->callid = callid;
+        pr->chandle = chandle;
         list_append(&pr->link, &pending_wait);
 }