Changes in uspace/lib/c/generic/net/modules.c [6b82009:64d2b10] in mainline

File:

• uspace/lib/c/generic/net/modules.c (modified) (4 diffs)

uspace/lib/c/generic/net/modules.c

@@ -45 +45 @@
 #include <ipc/services.h>
 #include <net/modules.h>
-#include <ns.h>
+
+/** The time between connect requests in microseconds. */
+#define MODULE_WAIT_TIME        (10 * 1000)
 
 /** Answer a call.
@@ -93 +95 @@
 }
 
-/** Create bidirectional connection with the needed module service and register
+/** Create bidirectional connection with the needed module service and registers
  * the message receiver.
  *
- * @param[in] need            Needed module service.
- * @param[in] arg1            First parameter.
- * @param[in] arg2            Second parameter.
- * @param[in] arg3            Third parameter.
- * @param[in] client_receiver Message receiver.
- *
- * @return Session to the needed service.
- * @return Other error codes as defined for the async_connect_to_me()
- *         function.
- *
- */
-async_sess_t *bind_service(services_t need, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3, async_client_conn_t client_receiver)
+ * @param[in] need      The needed module service.
+ * @param[in] arg1      The first parameter.
+ * @param[in] arg2      The second parameter.
+ * @param[in] arg3      The third parameter.
+ * @param[in] client_receiver The message receiver.
+ *
+ * @return              The phone of the needed service.
+ * @return              Other error codes as defined for the ipc_connect_to_me()
+ *                      function.
+ */
+int bind_service(services_t need, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
+    async_client_conn_t client_receiver)
+{
+        return bind_service_timeout(need, arg1, arg2, arg3, client_receiver, 0);
+}
+
+/** Create bidirectional connection with the needed module service and registers
+ * the message receiver.
+ *
+ * @param[in] need      The needed module service.
+ * @param[in] arg1      The first parameter.
+ * @param[in] arg2      The second parameter.
+ * @param[in] arg3      The third parameter.
+ * @param[in] client_receiver The message receiver.
+ * @param[in] timeout   The connection timeout in microseconds. No timeout if
+ *                      set to zero (0).
+ *
+ * @return              The phone of the needed service.
+ * @return              ETIMEOUT if the connection timeouted.
+ * @return              Other error codes as defined for the ipc_connect_to_me()
+ *                      function.
+ *
+ */
+int bind_service_timeout(services_t need, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
 {
         /* Connect to the needed service */
-        async_sess_t *sess = connect_to_service(need);
-        if (sess != NULL) {
+        int phone = connect_to_service_timeout(need, timeout);
+        if (phone >= 0) {
                 /* Request the bidirectional connection */
-                async_exch_t *exch = async_exchange_begin(sess);
-                int rc = async_connect_to_me(exch, arg1, arg2, arg3,
-                    client_receiver, NULL);
-                async_exchange_end(exch);
-                
+                int rc = async_connect_to_me(phone, arg1, arg2, arg3, client_receiver);
                 if (rc != EOK) {
-                        async_hangup(sess);
-                        errno = rc;
-                        return NULL;
+                        async_hangup(phone);
+                        return rc;
                 }
         }
         
-        return sess;
-}
-
-/** Connect to the needed module.
- *
- * @param[in] need Needed module service.
- *
- * @return Session to the needed service.
- * @return NULL if the connection timeouted.
- *
- */
-async_sess_t *connect_to_service(services_t need)
-{
-        return service_connect_blocking(EXCHANGE_SERIALIZE, need, 0, 0);
-}
-
-/** Reply the data to the other party.
- *
- * @param[in] data        The data buffer to be sent.
+        return phone;
+}
+
+/** Connects to the needed module.
+ *
+ * @param[in] need      The needed module service.
+ * @return              The phone of the needed service.
+ */
+int connect_to_service(services_t need)
+{
+        return connect_to_service_timeout(need, 0);
+}
+
+/** Connects to the needed module.
+ *
+ *  @param[in] need     The needed module service.
+ *  @param[in] timeout  The connection timeout in microseconds. No timeout if
+ *                      set to zero (0).
+ *  @return             The phone of the needed service.
+ *  @return             ETIMEOUT if the connection timeouted.
+ */
+int connect_to_service_timeout(services_t need, suseconds_t timeout)
+{
+        int phone;
+
+        /* If no timeout is set */
+        if (timeout <= 0)
+                return async_connect_me_to_blocking(PHONE_NS, need, 0, 0);
+
+        while (true) {
+                phone = async_connect_me_to(PHONE_NS, need, 0, 0);
+                if ((phone >= 0) || (phone != ENOENT))
+                        return phone;
+
+                /* Abort if no time is left */
+                if (timeout <= 0)
+                        return ETIMEOUT;
+
+                /* Wait the minimum of the module wait time and the timeout */
+                usleep((timeout <= MODULE_WAIT_TIME) ?
+                    timeout : MODULE_WAIT_TIME);
+                timeout -= MODULE_WAIT_TIME;
+        }
+}
+
+/** Replies the data to the other party.
+ *
+ * @param[in] data      The data buffer to be sent.
  * @param[in] data_length The buffer length.
- *
- * @return EOK on success.
- * @return EINVAL if the client does not expect the data.
- * @return EOVERFLOW if the client does not expect all the data.
- *         Only partial data are transfered.
- * @return Other error codes as defined for the
- *         async_data_read_finalize() function.
- *
+ * @return              EOK on success.
+ * @return              EINVAL if the client does not expect the data.
+ * @return              EOVERFLOW if the client does not expect all the data.
+ *                      Only partial data are transfered.
+ * @return              Other error codes as defined for the
+ *                      async_data_read_finalize() function.
  */
 int data_reply(void *data, size_t data_length)
@@ -159 +205 @@
         size_t length;
         ipc_callid_t callid;
-        
+
         /* Fetch the request */
         if (!async_data_read_receive(&callid, &length))
                 return EINVAL;
-        
+
         /* Check the requested data size */
         if (length < data_length) {
@@ -169 +215 @@
                 return EOVERFLOW;
         }
-        
+
         /* Send the data */
         return async_data_read_finalize(callid, data, data_length);