Changeset b2f05e2 in mainline for uspace/lib/c

Timestamp:

2020-01-09T06:27:27Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

8a74512

Parents:

33c5626

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-01-09 02:56:12)

git-committer:

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

Message:

Clean up taskman fallback handler

In the previous commits the handler has corrected but it left
behind a mess. This commit cleans up the code by using the
simplified function from async library

Location:

uspace/lib/c

Files:

• generic/taskman.c (modified) (1 diff)
• include/ipc/taskman.h (modified) (1 diff)

uspace/lib/c/generic/taskman.c

@@ -132 +132 @@
 {
         async_exch_t *exch = taskman_exchange_begin();
-        errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, TASKMAN_LOADER_CALLBACK, 0);
+        aid_t req = async_send_0(exch, TASKMAN_I_AM_LOADER, NULL);
+
+        errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, 0, 0);
         taskman_exchange_end(exch);
 
-        return rc;
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+
+        errno_t retval;
+        async_wait_for(req, &retval);
+        return retval;
 }
 

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

@@ -43 +43 @@
         TASKMAN_EVENT_CALLBACK,
         TASKMAN_NEW_TASK,
+
         TASKMAN_I_AM_NS,
+        TASKMAN_I_AM_LOADER,
 
         TASKMAN_CONNECT_TO_NS,
-        TASKMAN_CONNECT_TO_LOADER,
-        TASKMAN_LOADER_CALLBACK
+        TASKMAN_CONNECT_TO_LOADER
 } taskman_request_t;