Changeset b8341bc in mainline

Timestamp:

2019-08-07T05:42:02Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

c675ab1

Parents:

b22b0a94

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-19 22:25:17)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 05:42:02)

Message:

taskman: IPC builerplate for task event API

• Actual implementation tomorrow…

Conflicts:

uspace/lib/c/include/task.h

Location:

uspace

Files:

• app/tester/proc/task_anywait.c (modified) (1 diff)
• lib/c/generic/task.c (modified) (1 diff)
• lib/c/include/ipc/taskman.h (modified) (1 diff)
• lib/c/include/task.h (modified) (1 diff)
• srv/taskman/main.c (modified) (4 diffs)

uspace/app/tester/proc/task_anywait.c

@@ -102 +102 @@
         int rc;
 
-        task_set_event_handler(task_event_handler);
+        rc = task_register_event_handler(task_event_handler);
+        TASSERT(rc == EOK);
 
         TPRINTF("1 exit only\n");

uspace/lib/c/generic/task.c

@@ -472 +472 @@
 }
 
-void task_set_event_handler(task_event_handler_t handler)
-{
+// TODO extract to separate module
+static void taskman_task_event(ipc_callid_t iid, 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);
+
+        task_event_handler(tid, flags, texit, retval);
+
+        async_answer_0(iid, EOK);
+}
+
+static void taskman_event_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        /* Accept connection */
+        async_answer_0(iid, EOK);
+
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+
+                if (!IPC_GET_IMETHOD(call)) {
+                        /* Hangup, TODO explain or handle differntly */
+                        break;
+                }
+
+                switch (IPC_GET_IMETHOD(call)) {
+                case TASKMAN_EV_TASK:
+                        taskman_task_event(callid, &call);
+                        break;
+                default:
+                        async_answer_0(callid, ENOTSUP);
+                        break;
+                }
+        }
+}
+
+/**
+ * Blocks, calls handler in another fibril
+ */
+int task_register_event_handler(task_event_handler_t handler)
+{
+        /*
+         * 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;
-        // TODO implement logic for calling the handler
+
+        async_exch_t *exch = taskman_exchange_begin();
+        aid_t req = async_send_0(exch, TASKMAN_EVENT_CALLBACK, NULL);
+
+        int rc = async_connect_to_me(exch, 0, 0, 0, taskman_event_conn, NULL);
+        taskman_exchange_end(exch);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        return retval;
 }
 

uspace/lib/c/include/ipc/taskman.h

@@ -41 +41 @@
 typedef enum {
         TASKMAN_WAIT = IPC_FIRST_USER_METHOD,
-        TASKMAN_RETVAL
+        TASKMAN_RETVAL,
+        TASKMAN_EVENT_CALLBACK
 } taskman_request_t;
+
+typedef enum {
+        TASKMAN_EV_TASK = IPC_FIRST_USER_METHOD
+} taskman_event_t;
 
 typedef enum {

uspace/lib/c/include/task.h

@@ -75 +75 @@
 
 extern errno_t task_retval(int);
-extern void task_set_event_handler(task_event_handler_t);
+extern int task_register_event_handler(task_event_handler_t);
 
 #endif

uspace/srv/taskman/main.c

@@ -79 +79 @@
         async_exchange_end(exch);
 
-        /* After forward we can dispose all session-related resources */
+        /* After forward we can dispose all session-related resources
+         * TODO later could be recycled for notification API
+         */
         async_hangup(sess_ref->sess);
         free(sess_ref);
@@ -118 +120 @@
         int rc = task_set_retval(icall);
         async_answer_0(iid, rc);
+}
+
+static void taskman_ctl_ev_callback(ipc_callid_t iid, ipc_call_t *icall)
+{
+        printf("%s:%i from %llu\n", __func__, __LINE__, icall->in_task_id);
+        async_answer_0(iid, ENOTSUP); // TODO interrupt here
 }
 
@@ -152 +160 @@
                 case TASKMAN_RETVAL:
                         taskman_ctl_retval(callid, &call);
+                        break;
+                case TASKMAN_EVENT_CALLBACK:
+                        taskman_ctl_ev_callback(callid, &call);
                         break;
                 default:
@@ -223 +234 @@
         case TASKMAN_CONTROL:
                 control_connection(iid, icall);
-                // ---- interrupt here ----
-                //   implement control connection body (setup wait)
-                // ------------------------
                 break;
         default: