Changeset bf172825 in mainline

Timestamp:

2011-06-21T22:32:00Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

55091847, f1fae414

Parents:

e3a6c45

Message:

get rid of the weird timeout connection routines

Location:

uspace

Files:

• app/ping/ping.c (modified) (1 diff)
• lib/c/generic/net/icmp_common.c (modified) (1 diff)
• lib/c/generic/net/modules.c (modified) (2 diffs)
• lib/c/generic/net/socket_client.c (modified) (4 diffs)
• lib/c/include/net/icmp_common.h (modified) (1 diff)
• lib/c/include/net/modules.h (modified) (1 diff)
• srv/net/tl/tcp/tcp.c (modified) (1 diff)
• srv/net/tl/udp/udp.c (modified) (1 diff)

uspace/app/ping/ping.c

@@ -341 +341 @@
             config.dest_str, config.size, config.size);
         
-        int icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
+        int icmp_phone = icmp_connect_module();
         if (icmp_phone < 0) {
                 fprintf(stderr, "%s: Unable to connect to ICMP service (%s)\n", NAME,

uspace/lib/c/generic/net/icmp_common.c

@@ -45 +45 @@
 /** Connect to the ICMP module.
  *
- * @param[in] timeout Connection timeout in microseconds, zero
- *                    for no timeout.
- *
  * @return ICMP module phone on success.
- * @return ETIMEOUT if the connection timeouted.
  *
  */
-int icmp_connect_module(suseconds_t timeout)
+int icmp_connect_module(void)
 {
-        return connect_to_service_timeout(SERVICE_ICMP, timeout);
+        return connect_to_service(SERVICE_ICMP);
 }
 

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

@@ -114 +114 @@
     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 */
-        int phone = connect_to_service_timeout(need, timeout);
+        int phone = connect_to_service(need);
         if (phone >= 0) {
                 /* Request the bidirectional connection */
@@ -159 +136 @@
 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 service_obsolete_connect_blocking(need, 0, 0);
-        
-        while (true) {
-                phone = service_obsolete_connect(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;
-        }
+        return service_obsolete_connect_blocking(need, 0, 0);
 }
 

uspace/lib/c/generic/net/socket_client.c

@@ -64 +64 @@
 /** Maximum waiting sockets queue size. */
 #define SOCKET_MAX_ACCEPTED_SIZE        0
-
-/** Default timeout for connections in microseconds. */
-#define SOCKET_CONNECT_TIMEOUT  (1 * 1000 * 1000)
 
 /**
@@ -289 +286 @@
  * @return              The TCP module phone.
  * @return              Other error codes as defined for the
- *                      bind_service_timeout() function.
+ *                      bind_service() function.
  */
 static int socket_get_tcp_phone(void)
 {
         if (socket_globals.tcp_phone < 0) {
-                socket_globals.tcp_phone = bind_service_timeout(SERVICE_TCP,
-                    0, 0, SERVICE_TCP, socket_connection,
-                    SOCKET_CONNECT_TIMEOUT);
+                socket_globals.tcp_phone = bind_service(SERVICE_TCP,
+                    0, 0, SERVICE_TCP, socket_connection);
         }
 
@@ -308 +304 @@
  * @return              The UDP module phone.
  * @return              Other error codes as defined for the
- *                      bind_service_timeout() function.
+ *                      bind_service() function.
  */
 static int socket_get_udp_phone(void)
 {
         if (socket_globals.udp_phone < 0) {
-                socket_globals.udp_phone = bind_service_timeout(SERVICE_UDP,
-                    0, 0, SERVICE_UDP, socket_connection,
-                    SOCKET_CONNECT_TIMEOUT);
+                socket_globals.udp_phone = bind_service(SERVICE_UDP,
+                    0, 0, SERVICE_UDP, socket_connection);
         }
 
@@ -397 +392 @@
  * @return              Other error codes as defined for the NET_SOCKET message.
  * @return              Other error codes as defined for the
- *                      bind_service_timeout() function.
+ *                      bind_service() function.
  */
 int socket(int domain, int type, int protocol)

uspace/lib/c/include/net/icmp_common.h

@@ -41 +41 @@
 #include <sys/time.h>
 
-/** Default timeout for incoming connections in microseconds (1 sec). */
-#define ICMP_CONNECT_TIMEOUT  1000000
-
-extern int icmp_connect_module(suseconds_t);
+extern int icmp_connect_module(void);
 
 #endif

uspace/lib/c/include/net/modules.h

@@ -58 +58 @@
 extern int bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
     async_client_conn_t);
-extern int bind_service_timeout(services_t, sysarg_t, sysarg_t, sysarg_t,
-    async_client_conn_t, suseconds_t);
 extern int connect_to_service(services_t);
-extern int connect_to_service_timeout(services_t, suseconds_t);
 extern int data_reply(void *, size_t);
 extern void refresh_answer(ipc_call_t *, size_t *);

uspace/srv/net/tl/tcp/tcp.c

@@ -2483 +2483 @@
         tcp_globals.net_phone = net_phone;
         
-        tcp_globals.icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
+        tcp_globals.icmp_phone = icmp_connect_module();
         tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP,
             SERVICE_TCP, tcp_receiver);

uspace/srv/net/tl/udp/udp.c

@@ -396 +396 @@
         udp_globals.net_phone = net_phone;
         
-        udp_globals.icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
+        udp_globals.icmp_phone = icmp_connect_module();
         
         udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP,