#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)");
}
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);
action->request_list = xbt_fifo_new();
action->state = SIMIX_RUNNING;
action->execution.host = host;
-
+
#ifdef HAVE_TRACING
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);
+ 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);
-
+
return action;
}
action->request_list = xbt_fifo_new();
action->state = SIMIX_RUNNING;
action->execution.host = NULL; /* FIXME: do we need the list of hosts? */
-
+
#ifdef HAVE_TRACING
action->category = NULL;
#endif
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
- {
- 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);
+ 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);
}
DEBUG1("Create parallel execute action %p", action);
xbt_fifo_free(action->request_list);
- if (action->execution.surf_exec){
+ if (action->execution.surf_exec) {
surf_workstation_model->action_unref(action->execution.surf_exec);
action->execution.surf_exec = NULL;
}
-
+
#ifdef HAVE_TRACING
TRACE_smx_action_destroy(action);
#endif
{
DEBUG1("Cancel action %p", action);
- if(action->execution.surf_exec)
+ if (action->execution.surf_exec)
surf_workstation_model->action_cancel(action->execution.surf_exec);
}
double SIMIX_host_execution_get_remains(smx_action_t action)
{
- double result = 0;
-
- if(action->state == SIMIX_RUNNING)
+ double result = 0.0;
+
+ if (action->state == SIMIX_RUNNING)
result = surf_workstation_model->get_remains(action->execution.surf_exec);
return result;
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)
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)
SIMIX_execution_finish(action);
void SIMIX_host_execution_suspend(smx_action_t action)
{
+ if(action->execution.surf_exec)
surf_workstation_model->suspend(action->execution.surf_exec);
}
void SIMIX_host_execution_resume(smx_action_t action)
{
+ if(action->execution.surf_exec)
surf_workstation_model->suspend(action->execution.surf_exec);
}
/* do nothing, action done*/
DEBUG0("SIMIX_execution_finished: execution successful");
break;
-
+
case SIMIX_FAILED:
TRY {
DEBUG1("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
req->issuer->doexception = 1;
}
break;
-
+
case SIMIX_CANCELED:
TRY {
DEBUG0("SIMIX_execution_finished: execution canceled");
req->issuer->doexception = 1;
}
break;
-
+
default:
THROW_IMPOSSIBLE;
}
req->issuer->waiting_action = NULL;
+ req->host_execution_wait.result = action->state;
SIMIX_request_answer(req);
}
}
else
action->state = SIMIX_DONE;
- if (action->execution.surf_exec){
+ if (action->execution.surf_exec) {
surf_workstation_model->action_unref(action->execution.surf_exec);
action->execution.surf_exec = NULL;
}
-
+
/* If there are requests associated with the action, then answer them */
if (xbt_fifo_size(action->request_list))
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
+