Changeset 984a9ba in mainline for uspace/srv/ns/task.c

Timestamp:

2018-07-05T09:34:09Z (6 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63d46341

Parents:

76f566d

Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

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