Changeset 338a1a76 in mainline

Timestamp:

2020-01-09T01:03:40Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

e7faeba

Parents:

7dd7bc0

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-12-14 18:05:37)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-01-09 01:03:40)

Message:

Correcting sysman registering a port

• Correcting port handler - the new API does not need to accept the call
• Allowing multiple registration of event handler
• removing global variable holding the handler

Files:

• abi/include/abi/ipc/interfaces.h (modified) (1 diff)
• uspace/lib/c/generic/task_event.c (modified) (6 diffs)

abi/include/abi/ipc/interfaces.h

@@ -186 +186 @@
         INTERFACE_PCI =
             FOURCC_COMPACT('p', 'c', 'i', ' ') | IFACE_EXCHANGE_SERIALIZE,
+        INTERFACE_SYSMAN =
+            FOURCC_COMPACT('s', 'y', 's', 'm') | IFACE_EXCHANGE_SERIALIZE,
         INTERFACE_TASKMAN_CB =
-            FOURCC_COMPACT('t', 'a', 's', 'k') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
-        INTERFACE_SYSMAN =
-            FOURCC_COMPACT('s', 'y', 's', 'm') | IFACE_EXCHANGE_SERIALIZE
+            FOURCC_COMPACT('t', 'a', 's', 'k') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK
 } iface_t;
 

uspace/lib/c/generic/task_event.c

@@ -41 +41 @@
 #include "private/taskman.h"
 
-static task_event_handler_t task_event_handler = NULL;
-
-static void taskman_task_event(ipc_call_t *icall)
+static void taskman_task_event(ipc_call_t *icall, task_event_handler_t handler)
 {
         task_id_t tid = (task_id_t)
@@ -51 +49 @@
         int retval = ipc_get_arg5(icall);
 
-        task_event_handler(tid, flags, texit, retval);
+        handler(tid, flags, texit, retval);
 
         async_answer_0(icall, EOK);
@@ -58 +56 @@
 static void taskman_event_conn(ipc_call_t *icall, void *arg)
 {
-        /* Accept connection */
-        async_answer_0(icall, EOK);
-
         while (true) {
                 ipc_call_t call;
@@ -66 +61 @@
                 if (!async_get_call(&call) || !ipc_get_imethod(&call)) {
                         /* Hangup, end of game */
-                        break;
+                        async_answer_0(&call, EOK);
+                        return;
                 }
 
                 switch (ipc_get_imethod(&call)) {
                 case TASKMAN_EV_TASK:
-                        taskman_task_event(&call);
+                        taskman_task_event(&call, (task_event_handler_t)arg);
                         break;
                 default:
@@ -85 +81 @@
 errno_t task_register_event_handler(task_event_handler_t handler, bool past_events)
 {
-        /*
-         * so far support assign once, modification cannot be naïve due to
-         * races
-         */
-        assert(task_event_handler == NULL);
         assert(handler != NULL); /* no support for "unregistration" */
-
-        task_event_handler = handler;
 
         async_exch_t *exch = taskman_exchange_begin();
@@ -99 +88 @@
         port_id_t port;
         errno_t rc = async_create_callback_port(exch, INTERFACE_TASKMAN_CB, 0, 0,
-            taskman_event_conn, NULL, &port);
+            taskman_event_conn, handler, &port);
         taskman_exchange_end(exch);