Changeset 012dd8e in mainline for uspace/lib/c/generic/task.c

Timestamp:

2019-08-07T09:15:30Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

e8747bd8

Parents:

780c8ce

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-11-01 00:08:04)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 09:15:30)

Message:

taskman: Handle INIT_TASKS as tasks spawned by loader

• everyone is connected to its spawner, except for INIT_TASKS, they are connected to taskman (first binary)
• taskman is now aware even of INIT_TASKS and taskman itself
• refactored taskman handshake — NS session is created lazily
• refactored async.c with usage of create_session
• changed EINVAL to EINTR on lost waits
• removed TODOs from taskman and related libc TODOs

Conflicts:

abi/include/abi/ipc/methods.h
boot/Makefile.common
uspace/lib/c/generic/async.c
uspace/lib/c/generic/libc.c
uspace/lib/c/generic/loader.c
uspace/lib/c/generic/ns.c
uspace/lib/c/generic/private/async.h
uspace/lib/c/generic/private/taskman.h
uspace/lib/c/generic/task.c
uspace/lib/c/include/async.h
uspace/lib/c/include/task.h
uspace/srv/loader/main.c
uspace/srv/ns/ns.c

File:

• uspace/lib/c/generic/task.c (modified) (6 diffs)

uspace/lib/c/generic/task.c

@@ -49 +49 @@
 #include <str.h>
 #include <task.h>
+#include <taskman.h>
 #include <vfs/vfs.h>
-#include "private/ns.h"
+
 #include "private/task.h"
-
-static async_sess_t *session_taskman = NULL;
+#include "private/taskman.h"
 
 task_id_t task_get_id(void)
@@ -69 +69 @@
 }
 
-async_exch_t *taskman_exchange_begin(void)
-{
-        /* Lazy connection */
-        if (session_taskman == NULL) {
-                // TODO unify exchange mgmt with taskman_handshake/__init
-                session_taskman = service_connect_blocking(EXCHANGE_SERIALIZE,
-                    SERVICE_TASKMAN,
-                    TASKMAN_CONTROL,
-                    0);
-        }
-
-        if (session_taskman == NULL) {
-                return NULL;
-        }
-
-        async_exch_t *exch = async_exchange_begin(session_taskman);
-        return exch;
-}
-
-void taskman_exchange_end(async_exch_t *exch)
-{
-        async_exchange_end(exch);
-}
-
 /** Set the task name.
  *
@@ -129 +105 @@
  *
  * @return EOK on success, else error code.
- * @return TODO check this doesn't return EINVAL -- clash with task_wait
  */
 static errno_t task_setup_wait(task_id_t id, task_wait_t *wait)
@@ -393 +368 @@
  * (it can be reused, but must be reinitialized with task_setup_wait first)
  *
- * @param wait   task_wait_t previously initialized by task_setup_wait.
- * @param texit  Store type of task exit here.
- * @param retval Store return value of the task here.
+ * @param[in/out] wait   task_wait_t previously initialized by task_setup_wait
+ *                       or returned by task_wait with non-zero flags. the
+ *                       flags are updated so that they represent what can be
+ *                       still waited for.
+ * @param[out]    texit  Store type of task exit here.
+ * @param[out]    retval Store return value of the task here.
  *
  * @return EOK on success
- * @return EINVAL on lost wait TODO other error codes
+ * @return EINTR on lost wait
  */
 errno_t task_wait(task_wait_t *wait, task_exit_t *texit, int *retval)
@@ -405 +383 @@
         async_wait_for(wait->aid, &rc);
 
-        if (rc == EOK || rc == EINVAL) {
+        if (rc == EOK || rc == EINTR) {
                 if (wait->flags & TASK_WAIT_EXIT && texit)
                         *texit = ipc_get_arg1(wait->result);
@@ -471 +449 @@
 }
 
-void __task_init(async_sess_t *sess)
-{
-        assert(session_taskman == NULL);
-        session_taskman = sess;
-}
-
 /** @}
  */