Changeset 2f04bdd in mainline

Timestamp:

2020-01-05T03:04:37Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

16d748ee

Parents:

34e91bf

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-11-16 23:37:32)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-01-05 03:04:37)

Message:

Ensuring that taskman does not initialize itself

Taskman used to try to establish a connection to itself,
which of course did not work. With the old async api
this was not a big issue. But with the new one the taskman
port ends up being blocked.

File:

• uspace/lib/c/generic/libc.c (modified) (2 diffs)

uspace/lib/c/generic/libc.c

@@ -46 +46 @@
 #include <vfs/inbox.h>
 #include <io/kio.h>
+#include <str.h>
+#include <stats.h>
+
 #include "private/libc.h"
 #include "private/async.h"
@@ -66 +69 @@
 {
         if (__pcb == NULL) {
-                async_sess_t *session_tm = taskman_connect();
-                if (session_tm == NULL) {
+                //make sure taskman does not initialize itself
+                stats_task_t *stats = stats_get_task(task_get_id());
+                if (stats == NULL || stats->name == NULL)
                         abort();
+
+                if (str_cmp(stats->name, "init:taskman") != 0) {
+                        async_sess_t *session_tm = taskman_connect();
+                        if (session_tm == NULL)
+                                abort();
+                        __task_init(session_tm);
                 }
-                __task_init(session_tm);
+
+                free(stats);
         } else {
                 __task_init(__pcb->session_taskman);