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

uspace/lib/c/generic/io/input.c

@@ -43 +43 @@
 #include <stdlib.h>
 
-static void input_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
+static void input_cb_conn(ipc_call_t *icall, void *arg);
 
 errno_t input_open(async_sess_t *sess, input_ev_ops_t *ev_ops,
@@ -92 +92 @@
 }
 
-static void input_ev_active(input_t *input, cap_call_handle_t chandle,
-    ipc_call_t *call)
+static void input_ev_active(input_t *input, ipc_call_t *call)
 {
         errno_t rc = input->ev_ops->active(input);
-        async_answer_0(chandle, rc);
-}
-
-static void input_ev_deactive(input_t *input, cap_call_handle_t chandle,
-    ipc_call_t *call)
+        async_answer_0(call, rc);
+}
+
+static void input_ev_deactive(input_t *input, ipc_call_t *call)
 {
         errno_t rc = input->ev_ops->deactive(input);
-        async_answer_0(chandle, rc);
-}
-
-static void input_ev_key(input_t *input, cap_call_handle_t chandle,
-    ipc_call_t *call)
+        async_answer_0(call, rc);
+}
+
+static void input_ev_key(input_t *input, ipc_call_t *call)
 {
         kbd_event_type_t type;
@@ -121 +118 @@
 
         rc = input->ev_ops->key(input, type, key, mods, c);
-        async_answer_0(chandle, rc);
-}
-
-static void input_ev_move(input_t *input, cap_call_handle_t chandle,
-    ipc_call_t *call)
+        async_answer_0(call, rc);
+}
+
+static void input_ev_move(input_t *input, ipc_call_t *call)
 {
         int dx;
@@ -135 +131 @@
 
         rc = input->ev_ops->move(input, dx, dy);
-        async_answer_0(chandle, rc);
-}
-
-static void input_ev_abs_move(input_t *input, cap_call_handle_t chandle,
-    ipc_call_t *call)
+        async_answer_0(call, rc);
+}
+
+static void input_ev_abs_move(input_t *input, ipc_call_t *call)
 {
         unsigned x;
@@ -153 +148 @@
 
         rc = input->ev_ops->abs_move(input, x, y, max_x, max_y);
-        async_answer_0(chandle, rc);
-}
-
-static void input_ev_button(input_t *input, cap_call_handle_t chandle,
-    ipc_call_t *call)
+        async_answer_0(call, rc);
+}
+
+static void input_ev_button(input_t *input, ipc_call_t *call)
 {
         int bnum;
@@ -167 +161 @@
 
         rc = input->ev_ops->button(input, bnum, press);
-        async_answer_0(chandle, rc);
-}
-
-static void input_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
-{
-        input_t *input = (input_t *)arg;
+        async_answer_0(call, rc);
+}
+
+static void input_cb_conn(ipc_call_t *icall, void *arg)
+{
+        input_t *input = (input_t *) arg;
 
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -185 +179 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case INPUT_EVENT_ACTIVE:
-                        input_ev_active(input, chandle, &call);
+                        input_ev_active(input, &call);
                         break;
                 case INPUT_EVENT_DEACTIVE:
-                        input_ev_deactive(input, chandle, &call);
+                        input_ev_deactive(input, &call);
                         break;
                 case INPUT_EVENT_KEY:
-                        input_ev_key(input, chandle, &call);
+                        input_ev_key(input, &call);
                         break;
                 case INPUT_EVENT_MOVE:
-                        input_ev_move(input, chandle, &call);
+                        input_ev_move(input, &call);
                         break;
                 case INPUT_EVENT_ABS_MOVE:
-                        input_ev_abs_move(input, chandle, &call);
+                        input_ev_abs_move(input, &call);
                         break;
                 case INPUT_EVENT_BUTTON:
-                        input_ev_button(input, chandle, &call);
+                        input_ev_button(input, &call);
                         break;
                 default:
-                        async_answer_0(chandle, ENOTSUP);
+                        async_answer_0(&call, ENOTSUP);
                 }
         }