}
smx_action_t SIMIX_host_execute(const char *name, smx_host_t host,
- double computation_amount)
+ double computation_amount,
+ double priority)
{
/* alloc structures and initialize */
smx_action_t action = xbt_new0(s_smx_action_t, 1);
surf_workstation_model->extension.workstation.execute(host->host,
computation_amount);
surf_workstation_model->action_data_set(action->execution.surf_exec, action);
+ surf_workstation_model->set_priority(action->execution.surf_exec, priority);
}
#ifdef HAVE_TRACING
TRACE_smx_host_execute(action);
- TRACE_surf_action(action->execution.surf_exec, action->category);
#endif
DEBUG1("Create execute action %p", 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)
if (MC_IS_ENABLED){
action->state = SIMIX_DONE;
SIMIX_execution_finish(action);
+ return;
}
/* If the action is already finished then perform the error handling */
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)
THROW_IMPOSSIBLE;
}
req->issuer->waiting_action = NULL;
+ req->host_execution_wait.result = action->state;
SIMIX_request_answer(req);
}
+
+ /* We no longer need it */
+ SIMIX_host_execution_destroy(action);
}
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
+