Some more debuging

[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 5b6b6ec..6c538b7 100644 (file)
--- a/src/gras/Transport/rl_transport.c
+++ b/src/gras/Transport/rl_transport.c
@@ -42,7 +42,14 @@ gras_socket_t gras_trp_select(double timeout) {
   gras_socket_t sock_iter; /* iterating over all sockets */
   int cursor;              /* iterating over all sockets */
 
-   
+  /* Check whether there is more data to read from the socket we selected last time.
+     This can happen with tcp buffered sockets since we try to get as much data as we can for them */
+  static gras_socket_t _lastly_selected_socket = NULL;
+  if (_lastly_selected_socket && _lastly_selected_socket->moredata) {
+     VERB0("Returning _lastly_selected_socket since there is more data on it");
+     return _lastly_selected_socket;
+  }
+  
   /* Compute FD_SETSIZE */
 #ifdef HAVE_SYSCONF
    fd_setsize = sysconf( _SC_OPEN_MAX );
@@ -59,7 +66,7 @@ gras_socket_t gras_trp_select(double timeout) {
       now = gras_os_time();
       DEBUG2("wakeup=%f now=%f",wakeup, now);
       if (now == -1 || now >= wakeup) {
-       /* didn't find anything */
+       /* didn't find anything; no need to update _lastly_selected_socket since its moredata is 0 (or we would have returned it directly) */
        THROW1(timeout_error,0,
               "Timeout (%f) elapsed with selecting for incomming connexions",
               timeout);
@@ -70,6 +77,9 @@ gras_socket_t gras_trp_select(double timeout) {
     FD_ZERO(&FDS);
     max_fds = -1;
     xbt_dynar_foreach(sockets,cursor,sock_iter) {
+      if (!sock_iter->valid)
+        continue;
+       
       if (sock_iter->incoming) {
        DEBUG1("Considering socket %d for select",sock_iter->sd);
 #ifndef HAVE_WINSOCK_H
@@ -144,7 +154,7 @@ gras_socket_t gras_trp_select(double timeout) {
       continue;         /* this was a timeout */
     }
 
-    xbt_dynar_foreach(sockets,cursor,sock_iter) { 
+    xbt_dynar_foreach(sockets,cursor,sock_iter) {
        if(!FD_ISSET(sock_iter->sd, &FDS)) { /* this socket is not ready */
        continue;
        }
@@ -175,17 +185,18 @@ gras_socket_t gras_trp_select(double timeout) {
         } else if (recvd == 0) {
           /* Connection reset (=closed) by peer. */
           DEBUG1("Connection %d reset by peer", sock_iter->sd);
-          gras_socket_close(sock_iter); 
-          cursor--; 
+          sock_iter->valid=0; /* don't close it. User may keep references to it */
         } else { 
           /* Got a suited socket ! */
           XBT_OUT;
+          _lastly_selected_socket = sock_iter;
           return sock_iter;
         }
 
        } else {
         /* This is a file socket. Cannot recv() on it, but it must be alive */
           XBT_OUT;
+          _lastly_selected_socket = sock_iter;
           return sock_iter;
        }
 
@@ -197,8 +208,9 @@ gras_socket_t gras_trp_select(double timeout) {
 
   }
 
-  XBT_OUT;
-  return NULL;
+  /* No socket found. Maybe we had timeout=0 and nothing to do */
+  DEBUG0("TIMEOUT");
+  THROW0(timeout_error,0,"Timeout");
 }
 
 void gras_trp_sg_setup(gras_trp_plugin_t plug) {