Changeset 241f1985 in mainline for uspace/lib/c/generic/task_event.c

Timestamp:

2019-08-31T10:45:17Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

• uspace/lib/c/generic/task_event.c (modified) (5 diffs)

uspace/lib/c/generic/task_event.c

@@ -37 +37 @@
 #include <macros.h>
 #include <task.h>
+#include <assert.h>
 
 #include "private/taskman.h"
@@ -42 +43 @@
 static task_event_handler_t task_event_handler = NULL;
 
-static void taskman_task_event(ipc_callid_t iid, ipc_call_t *icall)
+static void taskman_task_event(ipc_call_t *icall)
 {
         task_id_t tid = (task_id_t)
-            MERGE_LOUP32(IPC_GET_ARG1(*icall), IPC_GET_ARG2(*icall));
-        int flags = IPC_GET_ARG3(*icall);
-        task_exit_t texit = IPC_GET_ARG4(*icall);
-        int retval = IPC_GET_ARG5(*icall);
+            MERGE_LOUP32(ipc_get_arg1(icall), ipc_get_arg2(icall));
+        int flags = ipc_get_arg3(icall);
+        task_exit_t texit = ipc_get_arg4(icall);
+        int retval = ipc_get_arg5(icall);
 
         task_event_handler(tid, flags, texit, retval);
 
-        async_answer_0(iid, EOK);
+        async_answer_0(icall, EOK);
 }
 
-static void taskman_event_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void taskman_event_conn(ipc_call_t *icall, void *arg)
 {
         /* Accept connection */
-        async_answer_0(iid, EOK);
+        async_answer_0(icall, EOK);
 
         while (true) {
                 ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-
-                if (!IPC_GET_IMETHOD(call)) {
+                
+                if (!async_get_call(&call) || !ipc_get_imethod(&call)) {
                         /* Hangup, end of game */
                         break;
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case TASKMAN_EV_TASK:
-                        taskman_task_event(callid, &call);
+                        taskman_task_event(&call);
                         break;
                 default:
-                        async_answer_0(callid, ENOTSUP);
+                        async_answer_0(&call, ENOTSUP);
                         break;
                 }
@@ -83 +83 @@
  * Blocks, calls handler in another fibril
  */
-int task_register_event_handler(task_event_handler_t handler, bool past_events)
+errno_t task_register_event_handler(task_event_handler_t handler, bool past_events)
 {
         /*
@@ -97 +97 @@
         aid_t req = async_send_1(exch, TASKMAN_EVENT_CALLBACK, past_events, NULL);
 
-        int rc = async_connect_to_me(exch, 0, 0, 0, taskman_event_conn, NULL);
+        port_id_t port;
+        errno_t rc = async_create_callback_port(exch, INTERFACE_TASKMAN_CB, 0, 0,
+                taskman_event_conn, NULL, &port);
         taskman_exchange_end(exch);
 
@@ -104 +106 @@
         }
 
-        sysarg_t retval;
+        errno_t retval;
         async_wait_for(req, &retval);
         return retval;