From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 7 Jul 2006 10:10:48 +0000 (+0000)
Subject: Sends in SG now have a 60s timeout. The right way to go is to have an adaptative... 
X-Git-Tag: v3.3~2853
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/10bda7a0c02fc986f3447f5321000a0b3d56e663

Sends in SG now have a 60s timeout. The right way to go is to have an adaptative timeout for both SG and RL, and also for receptions, but it won't be possible before 3.1. Moreover, the previous situation wasn't satisfactory either since we also had a semantic glitch between RL and SG (thanks to the channel semantic)


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

diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c
index bd0e50c533..67b2d8b32b 100644
--- a/src/gras/Msg/sg_msg.c
+++ b/src/gras/Msg/sg_msg.c
@@ -78,8 +78,8 @@ void gras_msg_send_ext(gras_socket_t   sock,
 
   DEBUG1("Prepare to send a message to %s",
 	 MSG_host_get_name (sock_data->to_host));
-  if (MSG_task_put(task, sock_data->to_host,sock_data->to_chan) != MSG_OK) 
-    THROW0(system_error,0,"Problem during the MSG_task_put");
+  if (MSG_task_put_with_timeout(task, sock_data->to_host,sock_data->to_chan,60.0) != MSG_OK) 
+    THROW0(system_error,0,"Problem during the MSG_task_put with timeout 60");
 
   VERB5("Sent to %s(%d) a message type '%s' kind '%s' ID %lu",
 	MSG_host_get_name(sock_data->to_host),sock_data->to_PID,
diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c
index fdf2fe4b8f..d70766f5bc 100644
--- a/src/gras/Transport/transport_plugin_sg.c
+++ b/src/gras/Transport/transport_plugin_sg.c
@@ -270,8 +270,8 @@ void gras_trp_sg_chunk_send_raw(gras_socket_t sock,
   DEBUG5("send chunk %s from %s to  %s:%d (size=%ld)",
 	 name, MSG_host_get_name(MSG_host_self()),
 	 MSG_host_get_name(sock_data->to_host), sock_data->to_chan,size);
-  if (MSG_task_put(task, sock_data->to_host,sock_data->to_chan) != MSG_OK) {
-    THROW0(system_error,0,"Problem during the MSG_task_put");
+  if (MSG_task_put_with_timeout(task, sock_data->to_host,sock_data->to_chan,60.0) != MSG_OK) {
+    THROW0(system_error,0,"Problem during the MSG_task_put with timeout 60");
   }
 }