Changeset 0f4532e in mainline

Timestamp:

2011-08-20T14:55:02Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

93ad49a8

Parents:

a0fc4be

Message:

Make service_connect() work with parallel exchange management.

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (1 diff)
• generic/ns.c (modified) (1 diff)
• include/async.h (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -1656 +1656 @@
         
         return sess;
+}
+
+/** Shift arguments for new connections left by one.
+ *
+ * FIXME This is an ugly hack to work around the problem that parallel
+ * exchanges are implemented using parallel connections. When we create
+ * such a session via a naming server, the naming server shifts the
+ * arguments for the initial connection, but not for the latter connections.
+ *
+ * The proper solution seems to be to implement parallel exchanges using
+ * tagging.
+ */
+void async_sess_args_shift(async_sess_t *sess)
+{
+        sess->arg1 = sess->arg2;
+        sess->arg2 = sess->arg3;
+        sess->arg3 = 0;
 }
 

uspace/lib/c/generic/ns.c

@@ -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_shift(sess);
+        
         return sess;
 }

uspace/lib/c/include/async.h

@@ -333 +333 @@
 extern void async_poke(void);
 
+void async_sess_args_shift(async_sess_t *sess);
+
 extern async_exch_t *async_exchange_begin(async_sess_t *);
 extern void async_exchange_end(async_exch_t *);