Changeset 3abf0760 in mainline

Timestamp:

2013-05-16T12:25:06Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89ac5513

Parents:

4510e06

Message:

Use two serialized sessions instead of one parallel to communicate with
the serial service.

This workarounds:

#508 Parallel sessions don't mix well with call forwarding

File:

• uspace/srv/net/slip/slip.c (modified) (5 diffs)

uspace/srv/net/slip/slip.c

@@ -275 +275 @@
         service_id_t linksid;
         category_id_t iplinkcid;
-        async_sess_t *sess = NULL;
+        async_sess_t *sess_in = NULL;
+        async_sess_t *sess_out = NULL;
         fid_t fid;
         int rc;
@@ -307 +308 @@
 
         /*
-         * Create a parallel session because we will need to be able to both
-         * read and write from the char_dev.
+         * Create two sessions to allow to both read and write from the
+         * char_dev at the same time.
          */
-        sess = loc_service_connect(EXCHANGE_PARALLEL, svcid, 0);
-        if (!sess) {
+        sess_out = loc_service_connect(EXCHANGE_SERIALIZE, svcid, 0);
+        if (!sess_out) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Failed to connect to service %s (ID=%d)",
@@ -317 +318 @@
                 return rc;
         }
-        slip_iplink.arg = sess;
+        slip_iplink.arg = sess_out;
+
+        sess_in = loc_service_connect(EXCHANGE_SERIALIZE, svcid, 0);
+        if (!sess_in) {
+                log_msg(LOG_DEFAULT, LVL_ERROR,
+                    "Failed to connect to service %s (ID=%d)",
+                    svcstr, (int) svcid);
+                goto fail;
+        }
 
         rc = loc_service_register(linkstr, &linksid);
@@ -335 +344 @@
         }
 
-        fid = fibril_create(slip_recv_fibril, sess);
+        fid = fibril_create(slip_recv_fibril, sess_in);
         if (!fid) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -346 +355 @@
 
 fail:
-        if (sess)
-                async_hangup(sess);
+        if (sess_out)
+                async_hangup(sess_out);
+        if (sess_in)
+                async_hangup(sess_in);
 
         /*