cosmetics

[simgrid.git] / src / gras / Transport / rl_transport.c

diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c
index 68d01bb..9624316 100644 (file)
--- a/src/gras/Transport/rl_transport.c
+++ b/src/gras/Transport/rl_transport.c
@@ -15,7 +15,7 @@ XBT_LOG_DEFAULT_CATEGORY(transport);
 /**
  * gras_trp_select:
  *
- * Returns the next socket to service having a message awaiting.
+ * Returns the next socket to service because it receives a message.
  *
  * if timeout<0, we ought to implement the adaptative timeout (FIXME)
  *
@@ -30,7 +30,7 @@ gras_trp_select(double timeout,
   xbt_error_t errcode;
   xbt_dynar_t sockets= gras_socketset_get();
   int done = -1;
-  double wakeup = gras_os_time() + 1000000*timeout;
+  double wakeup = gras_os_time() + timeout;
   double now = 0;
   /* nextToService used to make sure socket with high number do not starve */
   /*  static int nextToService = 0; */
@@ -70,8 +70,10 @@ gras_trp_select(double timeout,
 
     /* construct the set of socket to ear from */
     FD_ZERO(&FDS);
+    max_fds = -1;
     xbt_dynar_foreach(sockets,cursor,sock_iter) {
       if (sock_iter->incoming) {
+       DEBUG1("Considering socket %d for select",sock_iter->sd);
 #ifndef HAVE_WINSOCK_H
        if (max_fds < sock_iter->sd)
          max_fds = sock_iter->sd;
@@ -82,6 +84,17 @@ gras_trp_select(double timeout,
       }
     }
 
+    if (max_fds == -1) {
+       if (timeout > 0) {
+         DEBUG1("No socket to select onto. Sleep %f sec instead.",timeout);
+         gras_os_sleep(timeout);
+         return timeout_error;
+       } else {
+         DEBUG0("No socket to select onto. Return directly.");
+         return timeout_error;
+       }
+    }
+
 #ifndef HAVE_WINSOCK_H
     /* we cannot have more than FD_SETSIZE sockets 
        ... but with WINSOCK which returns sockets higher than the limit (killing this optim) */
@@ -110,7 +123,7 @@ gras_trp_select(double timeout,
       /* no timeout: good luck! */
       p_tout = NULL;
     }
-
+     
     DEBUG1("Selecting over %d socket(s)", max_fds-1);
     ready = select(max_fds, &FDS, NULL, NULL, p_tout);
     if (ready == -1) {
@@ -145,9 +158,9 @@ gras_trp_select(double timeout,
         /* not a socket but an ear. accept on it and serve next socket */
         gras_socket_t accepted=NULL;
         
-        DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted);
         TRY((sock_iter->plugin->socket_accept)(sock_iter,&accepted));
-        accepted->raw = sock_iter->raw;
+        DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted);
+        accepted->meas = sock_iter->meas;
        } else {
 #if 0 
        FIXME: this fails of files. quite logical