Changeset 8ff0bd2 in mainline for uspace/lib/c/generic/ns.c

Timestamp:

2011-09-04T11:30:58Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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 changes

File:

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

uspace/lib/c/generic/ns.c

@@ -42 +42 @@
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
-        int rc = async_connect_to_me(exch, service, 0, 0, NULL);
+        int rc = async_connect_to_me(exch, service, 0, 0, NULL, NULL);
         async_exchange_end(exch);
         
@@ -56 +56 @@
         async_exchange_end(exch);
         
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, arg2, arg3, 0);
+        
         return sess;
 }
@@ -66 +73 @@
             async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+        
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, arg2, arg3, 0);
         
         return sess;