xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
- xbt_dict_set(simix_global->host, smx_host->name, smx_host,
- &SIMIX_host_destroy);
+ xbt_lib_set(host_lib,smx_host->name,SIMIX_HOST_LEVEL,smx_host);
return smx_host;
}
{
smx_host_t host = (smx_host_t) h;
- xbt_assert0((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
msg = tmp;
}
SIMIX_display_process_status();
- THROW1(arg_error, 0, "%s", msg);
+ THROWF(arg_error, 0, "%s", msg);
}
xbt_swag_free(host->process_list);
*/
xbt_dict_t SIMIX_host_get_dict(void)
{
- return simix_global->host;
+ xbt_dict_t host_dict = xbt_dict_new();
+ xbt_lib_cursor_t cursor = NULL;
+ char *name = NULL;
+ void **host = NULL;
+
+ xbt_lib_foreach(host_lib, cursor, name, host){
+ if(host[SIMIX_HOST_LEVEL])
+ xbt_dict_set(host_dict,name,host[SIMIX_HOST_LEVEL],NULL);
+ }
+ return host_dict;
}
smx_host_t SIMIX_host_get_by_name(const char *name)
{
- xbt_assert0(((simix_global != NULL)
- && (simix_global->host != NULL)),
+ xbt_assert(((simix_global != NULL)
+ && (host_lib != NULL)),
"Environment not set yet");
- return xbt_dict_get_or_null(simix_global->host, name);
+ return xbt_lib_get_or_null(host_lib, name, SIMIX_HOST_LEVEL);
}
smx_host_t SIMIX_host_self(void)
const char* SIMIX_host_get_name(smx_host_t host)
{
- xbt_assert0((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
return host->name;
}
xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.get_properties(host->host);
}
double SIMIX_host_get_speed(smx_host_t host)
{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
get_speed(host->host, 1.0);
double SIMIX_host_get_available_speed(smx_host_t host)
{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
get_available_speed(host->host);
int SIMIX_host_get_state(smx_host_t host)
{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return surf_workstation_model->extension.workstation.
get_state(host->host);
void* SIMIX_host_get_data(smx_host_t host)
{
- xbt_assert0((host != NULL), "Invalid parameters (simix host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
return host->data;
}
void SIMIX_host_set_data(smx_host_t host, void *data)
{
- xbt_assert0((host != NULL), "Invalid parameters");
- xbt_assert0((host->data == NULL), "Data already set");
+ xbt_assert((host != NULL), "Invalid parameters");
+ xbt_assert((host->data == NULL), "Data already set");
host->data = data;
}
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);
+ smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
action->type = SIMIX_ACTION_EXECUTE;
action->name = xbt_strdup(name);
- action->request_list = xbt_fifo_new();
action->state = SIMIX_RUNNING;
action->execution.host = host;
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);
+ XBT_DEBUG("Create execute action %p", action);
return action;
}
int i;
/* alloc structures and initialize */
- smx_action_t action = xbt_new0(s_smx_action_t, 1);
+ smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator);
action->type = SIMIX_ACTION_PARALLEL_EXECUTE;
action->name = xbt_strdup(name);
- action->request_list = xbt_fifo_new();
action->state = SIMIX_RUNNING;
action->execution.host = NULL; /* FIXME: do we need the list of hosts? */
surf_workstation_model->action_data_set(action->execution.surf_exec, action);
}
- DEBUG1("Create parallel execute action %p", action);
+ XBT_DEBUG("Create parallel execute action %p", action);
return action;
}
void SIMIX_host_execution_destroy(smx_action_t action)
{
- DEBUG1("Destroy action %p", action);
-
- if (action->name)
- xbt_free(action->name);
+ XBT_DEBUG("Destroy action %p", action);
- xbt_fifo_free(action->request_list);
+ xbt_free(action->name);
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
- xbt_free(action);
+ xbt_mallocator_release(simix_global->action_mallocator, action);
}
void SIMIX_host_execution_cancel(smx_action_t action)
{
- DEBUG1("Cancel action %p", action);
+ XBT_DEBUG("Cancel action %p", action);
if (action->execution.surf_exec)
surf_workstation_model->action_cancel(action->execution.surf_exec);
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)
{
smx_action_t action = req->host_execution_wait.execution;
- DEBUG2("Wait for execution of action %p, state %d", action, action->state);
+ XBT_DEBUG("Wait for execution of action %p, state %d", action, action->state);
/* Associate this request to the action */
xbt_fifo_push(action->request_list, 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)
case SIMIX_DONE:
/* do nothing, action done*/
- DEBUG0("SIMIX_execution_finished: execution successful");
+ XBT_DEBUG("SIMIX_execution_finished: execution successful");
break;
case SIMIX_FAILED:
TRY {
- DEBUG1("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
- THROW0(host_error, 0, "Host failed");
+ XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
+ THROWF(host_error, 0, "Host failed");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
case SIMIX_CANCELED:
TRY {
- DEBUG0("SIMIX_execution_finished: execution canceled");
- THROW0(cancel_error, 0, "Canceled");
+ XBT_DEBUG("SIMIX_execution_finished: execution canceled");
+ THROWF(cancel_error, 0, "Canceled");
}
CATCH(req->issuer->running_ctx->exception) {
req->issuer->doexception = 1;
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)
#ifdef HAVE_TRACING
void SIMIX_set_category(smx_action_t action, const char *category)
{
- surf_workstation_model->set_category(action->execution.surf_exec, 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
