Changeset 984a9ba in mainline for uspace/srv/ns/clonable.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/clonable.c (modified) (8 diffs)

uspace/srv/ns/clonable.c

@@ -48 +48 @@
         service_t service;
         iface_t iface;
-        cap_call_handle_t chandle;
-        sysarg_t arg3;
+        ipc_call_t call;
 } cs_req_t;
 
@@ -74 +73 @@
  *
  */
-void register_clonable(service_t service, sysarg_t phone, ipc_call_t *call,
-    cap_call_handle_t chandle)
+void register_clonable(service_t service, sysarg_t phone, ipc_call_t *call)
 {
         link_t *req_link = list_first(&cs_req);
@@ -81 +79 @@
                 /* There was no pending connection request. */
                 printf("%s: Unexpected clonable server.\n", NAME);
-                async_answer_0(chandle, EBUSY);
+                async_answer_0(call, EBUSY);
                 return;
         }
@@ -91 +89 @@
         assert(csr->service == SERVICE_LOADER);
 
-        async_answer_0(chandle, EOK);
+        async_answer_0(call, EOK);
 
         async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
         if (sess == NULL)
-                async_answer_0(chandle, EIO);
+                async_answer_0(call, EIO);
 
         async_exch_t *exch = async_exchange_begin(sess);
-        async_forward_fast(csr->chandle, exch, csr->iface, csr->arg3, 0,
-            IPC_FF_NONE);
+        async_forward_fast(&csr->call, exch, csr->iface,
+            IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
         async_exchange_end(exch);
 
@@ -108 +106 @@
 /** Connect client to clonable service.
  *
- * @param service  Service to be connected to.
- * @param iface    Interface to be connected to.
- * @param call     Pointer to call structure.
- * @param chandle  Call handle of the request.
+ * @param service Service to be connected to.
+ * @param iface   Interface to be connected to.
+ * @param call    Pointer to call structure.
  *
  * @return Zero on success or a value from @ref errno.h.
  *
  */
-void connect_to_clonable(service_t service, iface_t iface, ipc_call_t *call,
-    cap_call_handle_t chandle)
+void connect_to_clonable(service_t service, iface_t iface, ipc_call_t *call)
 {
         assert(service == SERVICE_LOADER);
@@ -123 +119 @@
         cs_req_t *csr = malloc(sizeof(cs_req_t));
         if (csr == NULL) {
-                async_answer_0(chandle, ENOMEM);
+                async_answer_0(call, ENOMEM);
                 return;
         }
@@ -132 +128 @@
         if (rc != EOK) {
                 free(csr);
-                async_answer_0(chandle, rc);
+                async_answer_0(call, rc);
                 return;
         }
@@ -139 +135 @@
         csr->service = service;
         csr->iface = iface;
-        csr->chandle = chandle;
-        csr->arg3 = IPC_GET_ARG3(*call);
+        csr->call = *call;
 
         /*