Changeset 984a9ba in mainline for uspace/lib/c/generic/io/chardev_srv.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/lib/c/generic/io/chardev_srv.c (modified) (10 diffs)

uspace/lib/c/generic/io/chardev_srv.c

@@ -43 +43 @@
 static chardev_srv_t *chardev_srv_create(chardev_srvs_t *);
 
-static void chardev_read_srv(chardev_srv_t *srv, cap_call_handle_t chandle,
-    ipc_call_t *call)
+static void chardev_read_srv(chardev_srv_t *srv, ipc_call_t *icall)
 {
         void *buf;
@@ -50 +49 @@
         size_t nread;
         errno_t rc;
-        cap_call_handle_t rcall_handle;
 
-        if (!async_data_read_receive(&rcall_handle, &size)) {
-                async_answer_0(chandle, EINVAL);
+        ipc_call_t call;
+        if (!async_data_read_receive(&call, &size)) {
+                async_answer_0(icall, EINVAL);
                 return;
         }
@@ -59 +58 @@
         buf = malloc(size);
         if (buf == NULL) {
-                async_answer_0(rcall_handle, ENOMEM);
-                async_answer_0(chandle, ENOMEM);
+                async_answer_0(&call, ENOMEM);
+                async_answer_0(icall, ENOMEM);
                 return;
         }
 
         if (srv->srvs->ops->read == NULL) {
-                async_answer_0(rcall_handle, ENOTSUP);
-                async_answer_0(chandle, ENOTSUP);
+                async_answer_0(&call, ENOTSUP);
+                async_answer_0(icall, ENOTSUP);
                 free(buf);
                 return;
@@ -73 +72 @@
         rc = srv->srvs->ops->read(srv, buf, size, &nread);
         if (rc != EOK && nread == 0) {
-                async_answer_0(rcall_handle, rc);
-                async_answer_0(chandle, rc);
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
                 free(buf);
                 return;
         }
 
-        async_data_read_finalize(rcall_handle, buf, nread);
+        async_data_read_finalize(&call, buf, nread);
 
         free(buf);
-        async_answer_2(chandle, EOK, (sysarg_t) rc, nread);
+        async_answer_2(icall, EOK, (sysarg_t) rc, nread);
 }
 
-static void chardev_write_srv(chardev_srv_t *srv, cap_call_handle_t chandle,
-    ipc_call_t *call)
+static void chardev_write_srv(chardev_srv_t *srv, ipc_call_t *icall)
 {
         void *data;
@@ -95 +93 @@
         rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
         if (rc != EOK) {
-                async_answer_0(chandle, rc);
+                async_answer_0(icall, rc);
                 return;
         }
 
         if (srv->srvs->ops->write == NULL) {
-                async_answer_0(chandle, ENOTSUP);
+                async_answer_0(icall, ENOTSUP);
                 return;
         }
@@ -107 +105 @@
         free(data);
         if (rc != EOK && nwr == 0) {
-                async_answer_0(chandle, rc);
+                async_answer_0(icall, rc);
                 return;
         }
 
-        async_answer_2(chandle, EOK, (sysarg_t) rc, nwr);
+        async_answer_2(icall, EOK, (sysarg_t) rc, nwr);
 }
 
@@ -132 +130 @@
 }
 
-errno_t chardev_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, chardev_srvs_t *srvs)
+errno_t chardev_conn(ipc_call_t *icall, chardev_srvs_t *srvs)
 {
         chardev_srv_t *srv;
@@ -138 +136 @@
 
         /* Accept the connection */
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(icall, EOK);
 
         srv = chardev_srv_create(srvs);
@@ -152 +150 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
 
                 if (!method) {
                         /* The other side has hung up */
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         break;
                 }
@@ -163 +161 @@
                 switch (method) {
                 case CHARDEV_READ:
-                        chardev_read_srv(srv, chandle, &call);
+                        chardev_read_srv(srv, &call);
                         break;
                 case CHARDEV_WRITE:
-                        chardev_write_srv(srv, chandle, &call);
+                        chardev_write_srv(srv, &call);
                         break;
                 default:
                         if (srv->srvs->ops->def_handler != NULL)
-                                srv->srvs->ops->def_handler(srv, chandle, &call);
+                                srv->srvs->ops->def_handler(srv, &call);
                         else
-                                async_answer_0(chandle, ENOTSUP);
+                                async_answer_0(&call, ENOTSUP);
                 }
         }