From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 10 Oct 2007 22:44:47 +0000 (+0000)
Subject: Let's play safe here and don't loose the first char if the socket was already tested... 
X-Git-Tag: v3.3~989
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a04ee0550b9f78b95032b28e4568dbf31828d53d

Let's play safe here and don't loose the first char if the socket was already tested alive in hte last select, but not read from by caller (which would be such a weirdo)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4802 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c
index 254e1876ee..66ad0a2b7d 100644
--- a/src/gras/Transport/rl_transport.c
+++ b/src/gras/Transport/rl_transport.c
@@ -186,7 +186,13 @@ gras_socket_t gras_trp_select(double timeout) {
 	 /* Make sure the socket is still alive by reading the first byte */
 	 int recvd;
 
-	 recvd = read(sock_iter->sd, &sock_iter->recvd_val, 1);
+	 if (sock_iter->recvd) {
+	    /* Socket wasn't used since last time! Don't bother checking whether it's still alive */
+	    recvd = 1;
+	 } else {
+	    recvd = read(sock_iter->sd, &sock_iter->recvd_val, 1);
+	 }
+	  
 	 if (recvd < 0) {
 	   WARN2("socket %d failed: %s", sock_iter->sd, strerror(errno));
 	   /* done with this socket; remove it and break the foreach since it will change the dynar */
@@ -201,6 +207,7 @@ gras_socket_t gras_trp_select(double timeout) {
 	   /* Got a suited socket ! */
 	   XBT_OUT;
 	   sock_iter->recvd = 1;
+	   DEBUG3("Filled little buffer (%c %x %d)", sock_iter->recvd_val, sock_iter->recvd_val, recvd);
 	   _gras_lastly_selected_socket = sock_iter;
 	   /* break sync dynar iteration */
 	   xbt_dynar_cursor_unlock(sockets);