X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c79423e7376662ff7bcfa809c4803564cf82acb..24738931e11d38749f48fb869338c5c6fcd9a8f5:/src/gras/Transport/sg_transport.c

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index d9575baced..53019f5605 100644
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -55,10 +55,10 @@ gras_trp_select(double timeout,
 	DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter);
 	sockdata = sock_iter->data;
 
-	if (sock_iter->raw || !sock_iter->outgoing)
+	if (sock_iter->meas || !sock_iter->outgoing)
 	  continue;
 
-	if (sockdata->from_PID == r_pid) {
+	if (sockdata->to_PID == r_pid) {
 	  *dst=sock_iter;
 	  return no_error;
 	}
@@ -101,8 +101,8 @@ gras_trp_select(double timeout,
 
 	  xbt_dynar_foreach(remote_hd->ports, cpt, pr) {
 	    if (sockdata->to_chan == pr.tochan) {
-	      if (pr.raw) {
-		DEBUG0("Damn, it's raw");
+	      if (pr.meas) {
+		DEBUG0("Damn, it's for measurement");
 		continue;
 	      }
 
@@ -115,10 +115,10 @@ gras_trp_select(double timeout,
 	    }
 	  }
 	  if ((*dst)->peer_port == -10) {
-	    /* was raw */
+	    /* was for measurement */
 	    sockdata->to_chan = -1;
 	  } else {
-	    /* found it, don't let it override by raw */
+	    /* found it, don't let it override by meas */
 	    break;
 	  }
 	}
@@ -128,17 +128,20 @@ gras_trp_select(double timeout,
 
       return no_error;
     } else {
-      /*
-      DEBUG2("Select on %s@%s did not find anything yet",
+ 
+      DEBUG5("Select on %s@%s did not find anything yet at %f (waited %f of %f sec)",
 	     MSG_process_get_name(MSG_process_self()),
-	     MSG_host_get_name(MSG_host_self()));
-      */
+	     MSG_host_get_name(MSG_host_self()),
+	     gras_os_time(),
+	     gras_os_time()-startTime , timeout);
+ 
       /* MSG_process_sleep(1); */
       MSG_process_sleep(0.001);
     }
   } while (gras_os_time()-startTime < timeout
 	   || MSG_task_Iprobe((m_channel_t) pd->chan));
 
+  DEBUG0("TIMEOUT");
   return timeout_error;
 
 }