Changeset 984a9ba in mainline for uspace/srv/logger

Timestamp:

2018-07-05T09:34:09Z (7 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.

Location:

uspace/srv/logger

Files:

• ctl.c (modified) (3 diffs)
• logger.h (modified) (1 diff)
• main.c (modified) (1 diff)
• writer.c (modified) (5 diffs)

uspace/srv/logger/ctl.c

@@ -63 +63 @@
 }
 
-void logger_connection_handler_control(cap_call_handle_t chandle)
+void logger_connection_handler_control(ipc_call_t *icall)
 {
         errno_t rc;
         int fd;
 
-        async_answer_0(chandle, EOK);
+        async_answer_0(icall, EOK);
         logger_log("control: new client.\n");
 
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call))
@@ -81 +81 @@
                 case LOGGER_CONTROL_SET_DEFAULT_LEVEL:
                         rc = set_default_logging_level(IPC_GET_ARG1(call));
-                        async_answer_0(chandle, rc);
+                        async_answer_0(&call, rc);
                         break;
                 case LOGGER_CONTROL_SET_LOG_LEVEL:
                         rc = handle_log_level_change(IPC_GET_ARG1(call));
-                        async_answer_0(chandle, rc);
+                        async_answer_0(&call, rc);
                         break;
                 case LOGGER_CONTROL_SET_ROOT:
@@ -93 +93 @@
                                 vfs_put(fd);
                         }
-                        async_answer_0(chandle, rc);
+                        async_answer_0(&call, rc);
                         break;
                 default:
-                        async_answer_0(chandle, EINVAL);
+                        async_answer_0(&call, EINVAL);
                         break;
                 }

uspace/srv/logger/logger.h

@@ -98 +98 @@
 
 
-void logger_connection_handler_control(cap_call_handle_t);
-void logger_connection_handler_writer(cap_call_handle_t);
+void logger_connection_handler_control(ipc_call_t *);
+void logger_connection_handler_writer(ipc_call_t *);
 
 void parse_initial_settings(void);

uspace/srv/logger/main.c

@@ -48 +48 @@
 #include "logger.h"
 
-static void connection_handler_control(cap_call_handle_t icall_handle, ipc_call_t *icall,
-    void *arg)
+static void connection_handler_control(ipc_call_t *icall, void *arg)
 {
-        logger_connection_handler_control(icall_handle);
+        logger_connection_handler_control(icall);
 }
 
-static void connection_handler_writer(cap_call_handle_t icall_handle, ipc_call_t *icall,
-    void *arg)
+static void connection_handler_writer(ipc_call_t *icall, void *arg)
 {
-        logger_connection_handler_writer(icall_handle);
+        logger_connection_handler_writer(icall);
 }
 

uspace/srv/logger/writer.c

@@ -94 +94 @@
 }
 
-void logger_connection_handler_writer(cap_call_handle_t chandle)
+void logger_connection_handler_writer(ipc_call_t *icall)
 {
         logger_log_t *log;
@@ -100 +100 @@
 
         /* Acknowledge the connection. */
-        async_answer_0(chandle, EOK);
+        async_answer_0(icall, EOK);
 
         logger_log("writer: new client.\n");
@@ -109 +109 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call))
@@ -118 +118 @@
                         log = handle_create_log(IPC_GET_ARG1(call));
                         if (log == NULL) {
-                                async_answer_0(chandle, ENOMEM);
+                                async_answer_0(&call, ENOMEM);
                                 break;
                         }
                         if (!register_log(&registered_logs, log)) {
                                 log_unlock(log);
-                                async_answer_0(chandle, ELIMIT);
+                                async_answer_0(&call, ELIMIT);
                                 break;
                         }
                         log_unlock(log);
-                        async_answer_1(chandle, EOK, (sysarg_t) log);
+                        async_answer_1(&call, EOK, (sysarg_t) log);
                         break;
                 case LOGGER_WRITER_MESSAGE:
                         rc = handle_receive_message(IPC_GET_ARG1(call),
                             IPC_GET_ARG2(call));
-                        async_answer_0(chandle, rc);
+                        async_answer_0(&call, rc);
                         break;
                 default:
-                        async_answer_0(chandle, EINVAL);
+                        async_answer_0(&call, EINVAL);
                         break;
                 }
@@ -144 +144 @@
 }
 
-
 /**
  * @}