*/
xbt_dict_t SIMIX_host_get_dict(void)
{
- xbt_dict_t host_dict = xbt_dict_new();
+ xbt_dict_t host_dict = xbt_dict_new_homogeneous(NULL);
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);
+ xbt_dict_set(host_dict,name,host[SIMIX_HOST_LEVEL], NULL);
}
return host_dict;
}
void SIMIX_execution_finish(smx_action_t action)
{
- xbt_fifo_item_t item;
+ volatile xbt_fifo_item_t item;
smx_req_t req;
xbt_fifo_foreach(action->request_list, item, req, smx_req_t) {
switch (action->state) {
case SIMIX_DONE:
- /* do nothing, action done*/
+ /* do nothing, action done */
XBT_DEBUG("SIMIX_execution_finished: execution successful");
break;
case SIMIX_FAILED:
+ XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", req->issuer->smx_host->name);
TRY {
- 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) {
break;
case SIMIX_CANCELED:
+ XBT_DEBUG("SIMIX_execution_finished: execution canceled");
TRY {
- XBT_DEBUG("SIMIX_execution_finished: execution canceled");
THROWF(cancel_error, 0, "Canceled");
}
CATCH(req->issuer->running_ctx->exception) {
break;
default:
- THROW_IMPOSSIBLE;
+ xbt_die("Internal error in SIMIX_execution_finish: unexpected action state %d",
+ action->state);
}
req->issuer->waiting_action = NULL;
req->host_execution_wait.result = action->state;
/* 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