Rename MSG_TIMEOUT_FAILURE into MSG_TIMEOUT for sake of logic

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

diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index 65148e3..170255e 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -86,7 +86,7 @@ int master(int argc, char *argv[])
         ("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!",
          slaves[i % slaves_count]->name);
       MSG_task_destroy(task);
-    } else if (a == MSG_TIMEOUT_FAILURE) {
+    } else if (a == MSG_TIMEOUT) {
       INFO1
         ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!",
          slaves[i % slaves_count]->name);
@@ -112,7 +112,7 @@ int master(int argc, char *argv[])
       INFO1("Mmh. Can't reach '%s'! Nevermind. Let's keep going!",
             slaves[i]->name);
       MSG_task_destroy(task);
-    } else if (a == MSG_TIMEOUT_FAILURE) {
+    } else if (a == MSG_TIMEOUT) {
       INFO1
         ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!",
          slaves[i % slaves_count]->name);

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index e80eb71..20a35d6 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -117,7 +117,7 @@ SG_BEGIN_DECL()
 */ /* Keep these code as binary values: java bindings manipulate | of these values */
      typedef enum {
        MSG_OK = 0,            /**< @brief Everything is right. Keep on going this way ! */
-       MSG_TIMEOUT_FAILURE=1, /**< @brief nothing good happened before the timer you provided elapsed */
+       MSG_TIMEOUT=1,         /**< @brief nothing good happened before the timer you provided elapsed */
        MSG_TRANSFER_FAILURE=2,/**< @brief There has been a problem during you task
       transfer. Either the network is down or the remote host has been
       shutdown. */

diff --git a/src/bindings/ruby/rb_msg_task.c b/src/bindings/ruby/rb_msg_task.c
index 7e1b4c6..acf5598 100644 (file)
--- a/src/bindings/ruby/rb_msg_task.c
+++ b/src/bindings/ruby/rb_msg_task.c
@@ -86,7 +86,7 @@ void rb_task_send(VALUE class,VALUE task,VALUE mailbox) {
       rb_raise(rb_eRuntimeError,"Transfer failure while Sending");
     else if ( rv == MSG_HOST_FAILURE )
       rb_raise(rb_eRuntimeError,"Host failure while Sending");
-    else if ( rv == MSG_TIMEOUT_FAILURE )
+    else if ( rv == MSG_TIMEOUT )
       rb_raise(rb_eRuntimeError,"Timeout failure while Sending");
     else 
       rb_raise(rb_eRuntimeError,"MSG_task_send failed");

diff --git a/src/java/jmsg.c b/src/java/jmsg.c
index 8b57c1c..0d9ea23 100644 (file)
--- a/src/java/jmsg.c
+++ b/src/java/jmsg.c
@@ -994,7 +994,7 @@ Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  jxbt_check_res("MSG_task_send_with_timeout()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT_FAILURE,
+  jxbt_check_res("MSG_task_send_with_timeout()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
     bprintf("while sending task %s to mailbox %s", MSG_task_get_name(task),alias));
 }
 
@@ -1018,7 +1018,7 @@ Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  jxbt_check_res("MSG_task_send_bounded()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT_FAILURE,
+  jxbt_check_res("MSG_task_send_bounded()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
     bprintf("while sending task %s to mailbox %s with max rate %f", MSG_task_get_name(task),alias,(double)jmaxRate));
     
 }
@@ -1048,7 +1048,7 @@ Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
 
   (*env)->ReleaseStringUTFChars(env, jalias, alias);
 
-  jxbt_check_res("MSG_task_receive_ext()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT_FAILURE,
+  jxbt_check_res("MSG_task_receive_ext()",rv, MSG_HOST_FAILURE|MSG_TRANSFER_FAILURE|MSG_TIMEOUT,
     bprintf("while receiving from mailbox %s",alias));
 
   return (jobject) task->data;

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index c0e97dc..633a9de 100644 (file)
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -145,7 +145,7 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t *task, m_host_t host,
         ret = MSG_TRANSFER_FAILURE;
         break;
       case timeout_error:
-        ret = MSG_TIMEOUT_FAILURE;
+        ret = MSG_TIMEOUT;
         break;      
       default:
         xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg));
@@ -199,7 +199,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
         ret = MSG_TRANSFER_FAILURE;
         break;
       case timeout_error:
-        ret = MSG_TIMEOUT_FAILURE;
+        ret = MSG_TIMEOUT;
         break;
       default:
         xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg));