Changeset 0dd16778 in mainline for uspace/lib/c/generic

Timestamp:

2015-08-22T14:32:11Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f9b2cb4c

Parents:

78bb04b

Message:

start migrating devman to interfaces

Location:

uspace/lib/c/generic

Files:

• async.c (modified) (1 diff)
• loc.c (modified) (1 diff)
• ns.c (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -2272 +2272 @@
         sess->phone = phone;
         sess->arg1 = arg1;
+        sess->arg2 = arg2;
+        sess->arg3 = arg3;
+        
+        fibril_mutex_initialize(&sess->remote_state_mtx);
+        sess->remote_state_data = NULL;
+        
+        list_initialize(&sess->exch_list);
+        fibril_mutex_initialize(&sess->mutex);
+        atomic_set(&sess->refcnt, 0);
+        
+        return sess;
+}
+
+/** Wrapper for making IPC_M_CONNECT_ME_TO calls using the async framework.
+ *
+ * Ask through phone for a new connection to some service and block until
+ * success.
+ *
+ * @param exch  Exchange for sending the message.
+ * @param iface Connection interface.
+ * @param arg2  User defined argument.
+ * @param arg3  User defined argument.
+ *
+ * @return New session on success or NULL on error.
+ *
+ */
+async_sess_t *async_connect_me_to_iface(async_exch_t *exch, iface_t iface,
+    sysarg_t arg2, sysarg_t arg3)
+{
+        if (exch == NULL) {
+                errno = ENOENT;
+                return NULL;
+        }
+        
+        async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t));
+        if (sess == NULL) {
+                errno = ENOMEM;
+                return NULL;
+        }
+        
+        int phone = async_connect_me_to_internal(exch->phone, iface, arg2,
+            arg3, 0);
+        if (phone < 0) {
+                errno = phone;
+                free(sess);
+                return NULL;
+        }
+        
+        sess->iface = iface;
+        sess->phone = phone;
+        sess->arg1 = iface;
         sess->arg2 = arg2;
         sess->arg3 = arg3;

uspace/lib/c/generic/loc.c

@@ -569 +569 @@
 }
 
+async_sess_t *loc_service_connect_iface(service_id_t handle, iface_t iface,
+    unsigned int flags)
+{
+        async_sess_t *sess;
+        
+        if (flags & IPC_FLAG_BLOCKING)
+                sess = service_connect_blocking_iface_extended(SERVICE_LOC, iface, handle);
+        else
+                sess = service_connect_iface_extended(SERVICE_LOC, iface, handle);
+        
+        return sess;
+}
+
 async_sess_t *loc_service_connect(exch_mgmt_t mgmt, service_id_t handle,
     unsigned int flags)

uspace/lib/c/generic/ns.c

@@ -58 +58 @@
         async_sess_t *sess =
             async_connect_me_to(mgmt, exch, iface, service, arg3);
+        async_exchange_end(exch);
+        
+        if (!sess)
+                return NULL;
+        
+        /*
+         * 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, iface, arg3, 0);
+        
+        return sess;
+}
+
+async_sess_t *service_connect_iface_extended(service_t service, iface_t iface,
+    sysarg_t arg3)
+{
+        async_exch_t *exch = async_exchange_begin(session_ns);
+        if (!exch)
+                return NULL;
+        
+        async_sess_t *sess =
+            async_connect_me_to_iface(exch, iface, service, arg3);
         async_exchange_end(exch);