Sends in SG now have a 60s timeout. The right way to go is to have an adaptative...

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 bd0e50c..67b2d8b 100644 (file)
--- 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));
 
   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,
 
   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 fdf2fe4..d70766f 100644 (file)
--- 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);
   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");

   }
 }
 
   }
 }