From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 23 Mar 2010 12:26:26 +0000 (+0000)
Subject: Kill MSG_WARNING and MSG_FATAL return codes
X-Git-Tag: SVN~430
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/84ed556b8c7cf58207b813f2104075767c837d36

Kill MSG_WARNING and MSG_FATAL return codes

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

diff --git a/ChangeLog b/ChangeLog
index ab4d2b2a9a..77072d858c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,8 @@ SimGrid (3.3.5-svn) unstable; urgency=low
       and call MSG_action_trace_run(NULL)
     You can still have one merged file for each processes.
   * Kill the MSG_paje_output() function. It's a noop since 2 years.
+  * Kill MSG_WARNING and MSG_FATAL return codes: they were not used
+    anywere in source.
  SIMIX:
   * add a SIMIX_sem_get_capacity() function
       
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 8dd4bcc880..e80eb71c95 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -114,27 +114,17 @@ SG_BEGIN_DECL()
 /** @brief Error handling 
     @ingroup m_datatypes_management 
     @{
-*/
+*/ /* 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_WARNING,
-               /**< @brief Mmmh! Something must be not perfectly clean. But I
-      may be a paranoid freak... ! */
+       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_TRANSFER_FAILURE=2,
-                        /**< @brief There has been a problem during you task
+       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. */
-       MSG_HOST_FAILURE=4,
-                    /**< @brief System shutdown. The host on which you are
+       MSG_HOST_FAILURE=4,    /**< @brief System shutdown. The host on which you are
       running has just been rebooted. Free your datastructures and
       return now !*/
-       MSG_TASK_CANCELLED=8,
-                      /**< @brief Cancelled task. This task has been cancelled 
-			by somebody!*/
-       MSG_FATAL
-            /**< @brief You've done something wrong. You'd better look at it... */
+       MSG_TASK_CANCELLED=8,  /**< @brief Canceled task. This task has been canceled by somebody!*/
      } MSG_error_t;
 /** @} */
 
diff --git a/src/msg/task.c b/src/msg/task.c
index a54b159114..067793cb7f 100644
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -178,8 +178,7 @@ MSG_error_t MSG_task_cancel(m_task_t task)
     SIMIX_communication_cancel(task->simdata->comm);
     return MSG_OK;
   }
-
-  return MSG_FATAL;
+  THROW_IMPOSSIBLE;
 }
 
 /** \ingroup m_task_management