Changeset 95c675b in mainline for uspace/lib/c/generic/task.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

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

uspace/lib/c/generic/task.c

@@ -44 +44 @@
 #include <async.h>
 #include <errno.h>
+#include <ns.h>
 #include <malloc.h>
 #include <libc.h>
@@ -324 +325 @@
 int task_setup_wait(task_id_t id, task_wait_t *wait)
 {
-        async_exch_t *exch = async_exchange_begin(session_ns);
+        async_sess_t *sess_ns = ns_session_get();
+        if (sess_ns == NULL)
+                return EIO;
+
+        async_exch_t *exch = async_exchange_begin(sess_ns);
         wait->aid = async_send_2(exch, NS_TASK_WAIT, LOWER32(id), UPPER32(id),
             &wait->result);
@@ -401 +406 @@
 int task_retval(int val)
 {
-        async_exch_t *exch = async_exchange_begin(session_ns);
+        async_sess_t *sess_ns = ns_session_get();
+        if (sess_ns == NULL)
+                return EIO;
+
+        async_exch_t *exch = async_exchange_begin(sess_ns);
         int rc = (int) async_req_1_0(exch, NS_RETVAL, val);
         async_exchange_end(exch);