Make MSG_TASK_CANCELLED deprecated, replace it by MSG_TASK_CANCELED

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 1954c7d..1d02d0a 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -131,9 +131,10 @@ typedef enum {
   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_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 Canceled task. This task has been canceled by somebody!*/
+  MSG_TASK_CANCELED = 8,     /**< @brief Canceled task. This task has been canceled by somebody!*/

 } MSG_error_t;
 /** @} */
 
 } MSG_error_t;
 /** @} */
 

+

 SG_END_DECL()
 #endif
 SG_END_DECL()
 #endif

diff --git a/include/msg/msg.h b/include/msg/msg.h
index f84cbfd..232546d 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -236,6 +236,7 @@ MSG_error_t MSG_action_trace_run(char *path);
         MSG_mailbox_put_with_timeout(mailbox, task, timeout)
 
 #define MSG_process_change_host(h) MSG_process_migrate(MSG_process_self(),h);
         MSG_mailbox_put_with_timeout(mailbox, task, timeout)
 
 #define MSG_process_change_host(h) MSG_process_migrate(MSG_process_self(),h);

+#define MSG_TASK_CANCELLED MSG_TASK_CANCELED

 #endif
 
 #include "instr/instr.h"
 #endif
 
 #include "instr/instr.h"

diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c
index a1494c0..3200988 100644 (file)
--- a/src/msg/msg_gos.c
+++ b/src/msg/msg_gos.c
@@ -103,7 +103,7 @@ MSG_error_t MSG_task_execute(m_task_t task)
 #ifdef HAVE_TRACING
     TRACE_msg_task_execute_end(task);
 #endif
 #ifdef HAVE_TRACING
     TRACE_msg_task_execute_end(task);
 #endif

-    MSG_RETURN(MSG_TASK_CANCELLED);
+    MSG_RETURN(MSG_TASK_CANCELED);

   }
 }
 
   }
 }
 


@@ -214,7 +214,7 @@ MSG_error_t MSG_parallel_task_execute(m_task_t task)
     /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
     simdata->comm = NULL;
     simdata->compute = NULL;
     /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
     simdata->comm = NULL;
     simdata->compute = NULL;

-    MSG_RETURN(MSG_TASK_CANCELLED);
+    MSG_RETURN(MSG_TASK_CANCELED);

   }
 }
 
   }
 }
 

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index 7eac4a4..451ddcc 100644 (file)
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -381,7 +381,7 @@ void SIMIX_post_host_execute(smx_action_t action)
   /* FIXME: check if the host running the action failed or not*/
   /*if(surf_workstation_model->extension.workstation.get_state(action->host->host))*/
 
   /* FIXME: check if the host running the action failed or not*/
   /*if(surf_workstation_model->extension.workstation.get_state(action->host->host))*/
 

-  /* If the host running the action didn't fail, then the action was cancelled */
+  /* If the host running the action didn't fail, then the action was canceled */

   if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED)
      action->state = SIMIX_CANCELED;
   else
   if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED)
      action->state = SIMIX_CANCELED;
   else