Bugfix: return after answering the request when running in MC mode.

[simgrid.git] / src / simix / smx_host.c

diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index fec6e69..205c46b 100644 (file)
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -8,6 +8,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
+#include "mc/mc.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
                                 "Logging specific to SIMIX (hosts)");
@@ -191,20 +192,16 @@ smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
   action->category = NULL;
 #endif
 
-#ifdef HAVE_MC
   /* set surf's action */
-  if (!_surf_do_model_check)
-#endif
-  {
-  action->execution.surf_exec =
-    surf_workstation_model->extension.workstation.execute(host->host, 
-                                                          computation_amount);
-  surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+  if (!MC_IS_ENABLED) {
+    action->execution.surf_exec =
+      surf_workstation_model->extension.workstation.execute(host->host,
+         computation_amount);
+    surf_workstation_model->action_data_set(action->execution.surf_exec, action);
   }
 
 #ifdef HAVE_TRACING
   TRACE_smx_host_execute(action);
-  TRACE_surf_action(action->execution.surf_exec, action->category);
 #endif
 
   DEBUG1("Create execute action %p", action);
@@ -237,17 +234,14 @@ smx_action_t SIMIX_host_parallel_execute( const char *name,
   for (i = 0; i < host_nb; i++)
     workstation_list[i] = host_list[i]->host;
 
-#ifdef HAVE_MC
   /* set surf's action */
-  if (!_surf_do_model_check)
-#endif  
-  {
+  if (!MC_IS_ENABLED) {
     action->execution.surf_exec =
       surf_workstation_model->extension.workstation.
       execute_parallel_task(host_nb, workstation_list, computation_amount,
                            communication_amount, amount, rate);
 
-  surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+    surf_workstation_model->action_data_set(action->execution.surf_exec, action);
   }
   DEBUG1("Create parallel execute action %p", action);
 
@@ -278,7 +272,7 @@ void SIMIX_host_execution_cancel(smx_action_t action)
 {
   DEBUG1("Cancel action %p", action);
 
-  if (action->execution.surf_exec) 
+  if (action->execution.surf_exec)
     surf_workstation_model->action_cancel(action->execution.surf_exec);
 }
 
@@ -299,7 +293,8 @@ e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action)
 
 void SIMIX_host_execution_set_priority(smx_action_t action, double priority)
 {
-  surf_workstation_model->set_priority(action->execution.surf_exec, priority);
+  if(action->execution.surf_exec)
+    surf_workstation_model->set_priority(action->execution.surf_exec, priority);
 }
 
 void SIMIX_pre_host_execution_wait(smx_req_t req)
@@ -312,13 +307,12 @@ void SIMIX_pre_host_execution_wait(smx_req_t req)
   xbt_fifo_push(action->request_list, req);
   req->issuer->waiting_action = action;
 
-#ifdef HAVE_MC
   /* set surf's action */
-  if (_surf_do_model_check){
+  if (MC_IS_ENABLED){
     action->state = SIMIX_DONE;
     SIMIX_execution_finish(action);
+    return;
   }
-#endif  
 
   /* If the action is already finished then perform the error handling */
   if (action->state != SIMIX_RUNNING)
@@ -327,12 +321,14 @@ void SIMIX_pre_host_execution_wait(smx_req_t req)
 
 void SIMIX_host_execution_suspend(smx_action_t action)
 {
-  surf_workstation_model->suspend(action->execution.surf_exec);
+  if(action->execution.surf_exec)
+    surf_workstation_model->suspend(action->execution.surf_exec);
 }
 
 void SIMIX_host_execution_resume(smx_action_t action)
 {
-  surf_workstation_model->suspend(action->execution.surf_exec);
+  if(action->execution.surf_exec)
+    surf_workstation_model->suspend(action->execution.surf_exec);
 }
 
 void SIMIX_execution_finish(smx_action_t action)
@@ -398,3 +394,16 @@ void SIMIX_post_host_execute(smx_action_t action)
     SIMIX_execution_finish(action);
 }
 
+
+#ifdef HAVE_TRACING
+void SIMIX_set_category(smx_action_t action, const char *category)
+{
+  if (action->state != SIMIX_RUNNING) return;
+  if (action->type == SIMIX_ACTION_EXECUTE){
+    surf_workstation_model->set_category(action->execution.surf_exec, category);
+  }else if (action->type == SIMIX_ACTION_COMMUNICATE){
+    surf_workstation_model->set_category(action->comm.surf_comm, category);
+  }
+}
+#endif
+