X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d5b1f33a75eda059dc0d5acc6c0fac5ad532f30..15badc71ce964f6dae6428c9a4c0198fad5d4936:/src/simix/smx_host.c diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c index cc4273b864..cf11967d1a 100644 --- a/src/simix/smx_host.c +++ b/src/simix/smx_host.c @@ -13,8 +13,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "Logging specific to SIMIX (hosts)"); -xbt_dict_t watched_hosts_lib; - static void SIMIX_execution_finish(smx_action_t action); /** @@ -26,20 +24,100 @@ static void SIMIX_execution_finish(smx_action_t action); smx_host_t SIMIX_host_create(const char *name, void *workstation, void *data) { - smx_host_t smx_host = xbt_new0(s_smx_host_t, 1); + smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1); s_smx_process_t proc; /* Host structure */ - smx_host->name = xbt_strdup(name); smx_host->data = data; - smx_host->host = workstation; smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup)); /* Update global variables */ - xbt_lib_set(host_lib,smx_host->name,SIMIX_HOST_LEVEL,smx_host); + xbt_lib_set(host_lib,name,SIMIX_HOST_LEVEL,smx_host); + + return xbt_lib_get_elm_or_null(host_lib, name); +} - return smx_host; +void SIMIX_pre_host_on(smx_simcall_t simcall, smx_host_t h) +{ + SIMIX_host_on(h); +} + +/** + * \brief Start the host if it is off + * + */ +void SIMIX_host_on(smx_host_t h) +{ + smx_host_priv_t host = SIMIX_host_priv(h); + + xbt_assert((host != NULL), "Invalid parameters"); + + surf_model_t ws_model = surf_resource_model(h, SURF_WKS_LEVEL); + if (ws_model->extension.workstation.get_state(h)==SURF_RESOURCE_OFF) { + ws_model->extension.workstation.set_state(h, SURF_RESOURCE_ON); + unsigned int cpt; + smx_process_arg_t arg; + xbt_dynar_foreach(host->boot_processes,cpt,arg) { + smx_process_t process; + + XBT_DEBUG("Booting Process %s(%s) right now", arg->argv[0], arg->hostname); + if (simix_global->create_process_function) { + simix_global->create_process_function(&process, + arg->argv[0], + arg->code, + NULL, + arg->hostname, + arg->kill_time, + arg->argc, + arg->argv, + arg->properties, + arg->auto_restart); + } + else { + simcall_process_create(&process, + arg->argv[0], + arg->code, + NULL, + arg->hostname, + arg->kill_time, + arg->argc, + arg->argv, + arg->properties, + arg->auto_restart); + } + } + } +} + +void SIMIX_pre_host_off(smx_simcall_t simcall, smx_host_t h) +{ + SIMIX_host_off(h, simcall->issuer); +} + +/** + * \brief Stop the host if it is on + * + */ +void SIMIX_host_off(smx_host_t h, smx_process_t issuer) +{ + smx_host_priv_t host = SIMIX_host_priv(h); + + xbt_assert((host != NULL), "Invalid parameters"); + + surf_model_t ws_model = surf_resource_model(h, SURF_WKS_LEVEL); + if (ws_model->extension.workstation.get_state(h)==SURF_RESOURCE_ON) { + ws_model->extension.workstation.set_state(h, SURF_RESOURCE_OFF); + + /* Clean Simulator data */ + if (xbt_swag_size(host->process_list) != 0) { + smx_process_t process = NULL; + xbt_swag_foreach(process, host->process_list) { + SIMIX_process_kill(process, issuer); + XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_name(process->smx_host), issuer->name); + } + } + } } /** @@ -49,14 +127,13 @@ smx_host_t SIMIX_host_create(const char *name, */ void SIMIX_host_destroy(void *h) { - smx_host_t host = (smx_host_t) h; + smx_host_priv_t host = (smx_host_priv_t) h; xbt_assert((host != NULL), "Invalid parameters"); /* Clean Simulator data */ if (xbt_swag_size(host->process_list) != 0) { - char *msg = - bprintf("Shutting down host %s, but it's not empty:", host->name); + char *msg = xbt_strdup("Shutting down host, but it's not empty:"); char *tmp; smx_process_t process = NULL; @@ -69,41 +146,41 @@ void SIMIX_host_destroy(void *h) THROWF(arg_error, 0, "%s", msg); } xbt_dynar_free(&host->auto_restart_processes); + xbt_dynar_free(&host->boot_processes); xbt_swag_free(host->process_list); /* Clean host structure */ - free(host->name); - free(host); - + free(host); return; } -/** - * \brief Returns a dict of all hosts. - * - * \return List of all hosts (as a #xbt_dict_t) - */ -xbt_dict_t SIMIX_host_get_dict(void) -{ - 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); - } - return host_dict; +///** +// * \brief Returns a dict of all hosts. +// * +// * \return List of all hosts (as a #xbt_dict_t) +// */ +//xbt_dict_t SIMIX_host_get_dict(void) +//{ +// 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); +// } +// return host_dict; +//} +smx_host_t SIMIX_pre_host_get_by_name(smx_simcall_t simcall, const char *name){ + return SIMIX_host_get_by_name(name); } - -smx_host_t SIMIX_host_get_by_name(const char *name) -{ +smx_host_t SIMIX_host_get_by_name(const char *name){ xbt_assert(((simix_global != NULL) && (host_lib != NULL)), "Environment not set yet"); - return xbt_lib_get_or_null(host_lib, name, SIMIX_HOST_LEVEL); + return xbt_lib_get_elm_or_null(host_lib, name); } smx_host_t SIMIX_host_self(void) @@ -112,6 +189,9 @@ smx_host_t SIMIX_host_self(void) return (process == NULL) ? NULL : SIMIX_process_get_host(process); } +const char* SIMIX_pre_host_self_get_name(smx_simcall_t simcall){ + return SIMIX_host_self_get_name(); +} /* needs to be public and without simcall because it is called by exceptions and logging events */ const char* SIMIX_host_self_get_name(void) @@ -123,70 +203,95 @@ const char* SIMIX_host_self_get_name(void) return SIMIX_host_get_name(host); } -const char* SIMIX_host_get_name(smx_host_t host) -{ +const char* SIMIX_pre_host_get_name(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_name(host); +} +const char* SIMIX_host_get_name(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters"); - return host->name; + return sg_host_name(host); } -xbt_dict_t SIMIX_host_get_properties(smx_host_t host) -{ +xbt_dict_t SIMIX_pre_host_get_properties(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_properties(host); +} +xbt_dict_t SIMIX_host_get_properties(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation.get_properties(host->host); + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); + return ws_model->extension.workstation.get_properties(host); } -double SIMIX_host_get_speed(smx_host_t host) -{ +double SIMIX_pre_host_get_speed(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_speed(host); +} +double SIMIX_host_get_speed(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation. - get_speed(host->host, 1.0); + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); + return ws_model->extension.workstation.get_speed(host, 1.0); } -double SIMIX_host_get_available_speed(smx_host_t host) -{ +int SIMIX_pre_host_get_core(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_core(host); +} +int SIMIX_host_get_core(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); return surf_workstation_model->extension.workstation. - get_available_speed(host->host); + get_core(host); } -int SIMIX_host_get_state(smx_host_t host) -{ + + +double SIMIX_pre_host_get_available_speed(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_available_speed(host); +} +double SIMIX_host_get_available_speed(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return surf_workstation_model->extension.workstation. - get_state(host->host); + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); + return ws_model->extension.workstation.get_available_speed(host); } +int SIMIX_pre_host_get_state(smx_simcall_t simcall, smx_host_t host){ + return SIMIX_host_get_state(host); +} +int SIMIX_host_get_state(smx_host_t host){ + xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); + + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); + return ws_model->extension.workstation.get_state(host); +} + +void* SIMIX_pre_host_self_get_data(smx_simcall_t simcall){ + return SIMIX_host_self_get_data(); +} void* SIMIX_host_self_get_data(void) { - return SIMIX_host_get_data(SIMIX_host_self()); + smx_host_t self = SIMIX_host_self(); + return SIMIX_host_get_data(self); } void SIMIX_host_self_set_data(void *data) { - SIMIX_host_set_data(SIMIX_host_self(), data); + smx_host_t self = SIMIX_host_self(); + SIMIX_host_set_data(self, data); } -void* SIMIX_host_get_data(smx_host_t host) -{ +void* SIMIX_pre_host_get_data(smx_simcall_t simcall,smx_host_t host){ + return SIMIX_host_get_data(host); +} +void* SIMIX_host_get_data(smx_host_t host){ xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)"); - return host->data; + return SIMIX_host_priv(host)->data; } -void _SIMIX_host_free_process_arg(void *); + void _SIMIX_host_free_process_arg(void *data) { smx_process_arg_t arg = *(void**)data; - int i; xbt_free(arg->name); - for (i = 0; i < arg->argc; i++) { - xbt_free(arg->argv[i]); - } - xbt_free(arg->argv); xbt_free(arg); } /** @@ -206,33 +311,34 @@ void SIMIX_host_add_auto_restart_process(smx_host_t host, xbt_dict_t properties, int auto_restart) { - if (!host->auto_restart_processes) { - host->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg); + if (!SIMIX_host_priv(host)->auto_restart_processes) { + SIMIX_host_priv(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg); } smx_process_arg_t arg = xbt_new(s_smx_process_arg_t,1); - arg->name = xbt_strdup(name); arg->code = code; arg->data = data; arg->hostname = hostname; arg->kill_time = kill_time; arg->argc = argc; + arg->argv = xbt_new(char*,argc + 1); int i; for (i = 0; i < argc; i++) { arg->argv[i] = xbt_strdup(argv[i]); } + arg->argv[argc] = NULL; arg->properties = properties; arg->auto_restart = auto_restart; if( SIMIX_host_get_state(host) == SURF_RESOURCE_OFF - && !xbt_dict_get_or_null(watched_hosts_lib,host->name)){ - xbt_dict_set(watched_hosts_lib,host->name,host,NULL); - XBT_DEBUG("Have push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",host->name); + && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_name(host))){ + xbt_dict_set(watched_hosts_lib,sg_host_name(host),host,NULL); + XBT_DEBUG("Have push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host)); } - xbt_dynar_push_as(host->auto_restart_processes,smx_process_arg_t,arg); + xbt_dynar_push_as(SIMIX_host_priv(host)->auto_restart_processes,smx_process_arg_t,arg); } /** * \brief Restart the list of processes that have been registered to the host @@ -241,7 +347,7 @@ void SIMIX_host_restart_processes(smx_host_t host) { unsigned int cpt; smx_process_arg_t arg; - xbt_dynar_foreach(host->auto_restart_processes,cpt,arg) { + xbt_dynar_foreach(SIMIX_host_priv(host)->auto_restart_processes,cpt,arg) { smx_process_t process; @@ -272,21 +378,34 @@ void SIMIX_host_restart_processes(smx_host_t host) } } - xbt_dynar_reset(host->auto_restart_processes); + xbt_dynar_reset(SIMIX_host_priv(host)->auto_restart_processes); } -void SIMIX_host_set_data(smx_host_t host, void *data) +void SIMIX_host_autorestart(smx_host_t host) { + if(simix_global->autorestart) + simix_global->autorestart(host); + else + xbt_die("No function for simix_global->autorestart"); +} + +void SIMIX_pre_host_set_data(smx_simcall_t simcall, smx_host_t host, void *data) { + SIMIX_host_set_data(host, data); +} +void SIMIX_host_set_data(smx_host_t host, void *data){ xbt_assert((host != NULL), "Invalid parameters"); - xbt_assert((host->data == NULL), "Data already set"); + xbt_assert((SIMIX_host_priv(host)->data == NULL), "Data already set"); - host->data = data; + SIMIX_host_priv(host)->data = data; } -smx_action_t SIMIX_host_execute(const char *name, smx_host_t host, - double computation_amount, - double priority) -{ +smx_action_t SIMIX_pre_host_execute(smx_simcall_t simcall,const char *name, + smx_host_t host, double computation_amount, double priority, double bound){ + return SIMIX_host_execute(name, host, computation_amount, priority, bound); +} +smx_action_t SIMIX_host_execute(const char *name, + smx_host_t host, double computation_amount, double priority, double bound){ + /* alloc structures and initialize */ smx_action_t action = xbt_mallocator_get(simix_global->action_mallocator); action->type = SIMIX_ACTION_EXECUTE; @@ -298,13 +417,13 @@ smx_action_t SIMIX_host_execute(const char *name, smx_host_t host, action->category = NULL; #endif + surf_model_t ws_model = surf_resource_model(host, SURF_WKS_LEVEL); /* set surf's 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); + if (!MC_is_active()) { + action->execution.surf_exec = ws_model->extension.workstation.execute(host, computation_amount); + ws_model->action_data_set(action->execution.surf_exec, action); + ws_model->set_priority(action->execution.surf_exec, priority); + ws_model->set_bound(action->execution.surf_exec, bound); } XBT_DEBUG("Create execute action %p", action); @@ -312,11 +431,18 @@ smx_action_t SIMIX_host_execute(const char *name, smx_host_t host, return action; } -smx_action_t SIMIX_host_parallel_execute( const char *name, +smx_action_t SIMIX_pre_host_parallel_execute(smx_simcall_t simcall, const char *name, int host_nb, smx_host_t *host_list, double *computation_amount, double *communication_amount, - double amount, double rate) -{ + double amount, double rate){ + return SIMIX_host_parallel_execute(name, host_nb, host_list, computation_amount, + communication_amount, amount, rate); +} +smx_action_t SIMIX_host_parallel_execute(const char *name, + int host_nb, smx_host_t *host_list, + double *computation_amount, double *communication_amount, + double amount, double rate){ + void **workstation_list = NULL; int i; @@ -334,71 +460,117 @@ smx_action_t SIMIX_host_parallel_execute( const char *name, /* set surf's action */ workstation_list = xbt_new0(void *, host_nb); for (i = 0; i < host_nb; i++) - workstation_list[i] = host_list[i]->host; + workstation_list[i] = host_list[i]; + + + /* FIXME: what happens if host_list contains VMs and PMs. If + * execute_parallel_task() does not change the state of the model, we can mix + * them. */ + surf_model_t ws_model = surf_resource_model(host_list[0], SURF_WKS_LEVEL); + for (i = 1; i < host_nb; i++) { + surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_WKS_LEVEL); + if (ws_model_tmp != ws_model) { + XBT_CRITICAL("mixing VMs and PMs is not supported"); + DIE_IMPOSSIBLE; + } + } /* set surf's action */ - if (!MC_IS_ENABLED) { + if (!MC_is_active()) { action->execution.surf_exec = - surf_workstation_model->extension.workstation. + ws_model->extension.workstation. execute_parallel_task(host_nb, workstation_list, computation_amount, communication_amount, rate); - surf_workstation_model->action_data_set(action->execution.surf_exec, action); + ws_model->action_data_set(action->execution.surf_exec, action); } XBT_DEBUG("Create parallel execute action %p", action); return action; } -void SIMIX_host_execution_destroy(smx_action_t action) +static surf_model_t get_ws_model_from_action(smx_action_t action) { - int destroyed=0; + xbt_assert(action->type == SIMIX_ACTION_EXECUTE); + smx_host_t host = action->execution.host; + surf_model_t model = surf_resource_model(host, SURF_WKS_LEVEL); + + xbt_assert((model == surf_workstation_model) || (model == surf_vm_workstation_model)); + + return model; +} + +void SIMIX_pre_host_execution_destroy(smx_simcall_t simcall, smx_action_t action){ + SIMIX_host_execution_destroy(action); +} +void SIMIX_host_execution_destroy(smx_action_t action){ XBT_DEBUG("Destroy action %p", action); + surf_model_t ws_model = get_ws_model_from_action(action); if (action->execution.surf_exec) { - destroyed = surf_workstation_model->action_unref(action->execution.surf_exec); + ws_model->action_unref(action->execution.surf_exec); action->execution.surf_exec = NULL; } - - if (destroyed) { - xbt_free(action->name); - xbt_mallocator_release(simix_global->action_mallocator, action); - } + xbt_free(action->name); + xbt_mallocator_release(simix_global->action_mallocator, action); } -void SIMIX_host_execution_cancel(smx_action_t action) -{ +void SIMIX_pre_host_execution_cancel(smx_simcall_t simcall, smx_action_t action){ + SIMIX_host_execution_cancel(action); +} +void SIMIX_host_execution_cancel(smx_action_t action){ XBT_DEBUG("Cancel action %p", action); + surf_model_t ws_model = get_ws_model_from_action(action); + if (action->execution.surf_exec) - surf_workstation_model->action_cancel(action->execution.surf_exec); + ws_model->action_cancel(action->execution.surf_exec); } -double SIMIX_host_execution_get_remains(smx_action_t action) -{ +double SIMIX_pre_host_execution_get_remains(smx_simcall_t simcall, smx_action_t action){ + return SIMIX_host_execution_get_remains(action); +} +double SIMIX_host_execution_get_remains(smx_action_t action){ double result = 0.0; + surf_model_t ws_model = get_ws_model_from_action(action); if (action->state == SIMIX_RUNNING) - result = surf_workstation_model->get_remains(action->execution.surf_exec); + result = ws_model->get_remains(action->execution.surf_exec); return result; } -e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action) -{ +e_smx_state_t SIMIX_pre_host_execution_get_state(smx_simcall_t simcall, smx_action_t action){ + return SIMIX_host_execution_get_state(action); +} +e_smx_state_t SIMIX_host_execution_get_state(smx_action_t action){ return action->state; } -void SIMIX_host_execution_set_priority(smx_action_t action, double priority) -{ +void SIMIX_pre_host_execution_set_priority(smx_simcall_t simcall, smx_action_t action, + double priority){ + SIMIX_host_execution_set_priority(action, priority); +} +void SIMIX_host_execution_set_priority(smx_action_t action, double priority){ + surf_model_t ws_model = get_ws_model_from_action(action); + if(action->execution.surf_exec) - surf_workstation_model->set_priority(action->execution.surf_exec, priority); + ws_model->set_priority(action->execution.surf_exec, priority); } -void SIMIX_pre_host_execution_wait(smx_simcall_t simcall) -{ - smx_action_t action = simcall->host_execution_wait.execution; +void SIMIX_pre_host_execution_set_bound(smx_simcall_t simcall, smx_action_t action, + double bound){ + SIMIX_host_execution_set_bound(action, bound); +} +void SIMIX_host_execution_set_bound(smx_action_t action, double bound){ + surf_model_t ws_model = get_ws_model_from_action(action); + + if(action->execution.surf_exec) + ws_model->set_bound(action->execution.surf_exec, bound); +} + +void SIMIX_pre_host_execution_wait(smx_simcall_t simcall, smx_action_t action){ XBT_DEBUG("Wait for execution of action %p, state %d", action, (int)action->state); @@ -407,7 +579,7 @@ void SIMIX_pre_host_execution_wait(smx_simcall_t simcall) simcall->issuer->waiting_action = action; /* set surf's action */ - if (MC_IS_ENABLED) { + if (MC_is_active()) { action->state = SIMIX_DONE; SIMIX_execution_finish(action); return; @@ -420,20 +592,25 @@ void SIMIX_pre_host_execution_wait(smx_simcall_t simcall) void SIMIX_host_execution_suspend(smx_action_t action) { + surf_model_t ws_model = get_ws_model_from_action(action); + if(action->execution.surf_exec) - surf_workstation_model->suspend(action->execution.surf_exec); + ws_model->suspend(action->execution.surf_exec); } void SIMIX_host_execution_resume(smx_action_t action) { + surf_model_t ws_model = get_ws_model_from_action(action); + if(action->execution.surf_exec) - surf_workstation_model->resume(action->execution.surf_exec); + ws_model->resume(action->execution.surf_exec); } void SIMIX_execution_finish(smx_action_t action) { xbt_fifo_item_t item; smx_simcall_t simcall; + surf_model_t ws_model = get_ws_model_from_action(action); xbt_fifo_foreach(action->simcalls, item, simcall, smx_simcall_t) { @@ -445,7 +622,7 @@ void SIMIX_execution_finish(smx_action_t action) break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->smx_host->name); + XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->smx_host)); simcall->issuer->context->iwannadie = 1; //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break; @@ -460,13 +637,12 @@ void SIMIX_execution_finish(smx_action_t action) (int)action->state); } /* check if the host is down */ - if (surf_workstation_model->extension. - workstation.get_state(simcall->issuer->smx_host->host) != SURF_RESOURCE_ON) { + if (ws_model->extension.workstation.get_state(simcall->issuer->smx_host) != SURF_RESOURCE_ON) { simcall->issuer->context->iwannadie = 1; } simcall->issuer->waiting_action = NULL; - simcall->host_execution_wait.result = action->state; + simcall_host_execution_wait__set__result(simcall, action->state); SIMIX_simcall_answer(simcall); } @@ -474,15 +650,18 @@ void SIMIX_execution_finish(smx_action_t action) SIMIX_host_execution_destroy(action); } + void SIMIX_post_host_execute(smx_action_t action) { + surf_model_t ws_model = get_ws_model_from_action(action); + if (action->type == SIMIX_ACTION_EXECUTE && /* FIMXE: handle resource failure * for parallel tasks too */ - surf_workstation_model->extension.workstation.get_state(action->execution.host->host) == SURF_RESOURCE_OFF) { + ws_model->extension.workstation.get_state(action->execution.host) == SURF_RESOURCE_OFF) { /* If the host running the action failed, notice it so that the asking * process can be killed if it runs on that host itself */ action->state = SIMIX_FAILED; - } else if (surf_workstation_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED) { + } else if (ws_model->action_state_get(action->execution.surf_exec) == SURF_ACTION_FAILED) { /* If the host running the action didn't fail, then the action was * canceled */ action->state = SIMIX_CANCELED; @@ -491,7 +670,7 @@ void SIMIX_post_host_execute(smx_action_t action) } if (action->execution.surf_exec) { - surf_workstation_model->action_unref(action->execution.surf_exec); + ws_model->action_unref(action->execution.surf_exec); action->execution.surf_exec = NULL; } @@ -503,14 +682,50 @@ void SIMIX_post_host_execute(smx_action_t action) #ifdef HAVE_TRACING +void SIMIX_pre_set_category(smx_simcall_t simcall, smx_action_t action, + const char *category){ + SIMIX_set_category(action, category); +} void SIMIX_set_category(smx_action_t action, const char *category) { + surf_model_t ws_model = get_ws_model_from_action(action); + if (action->state != SIMIX_RUNNING) return; if (action->type == SIMIX_ACTION_EXECUTE){ - surf_workstation_model->set_category(action->execution.surf_exec, category); + ws_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); + ws_model->set_category(action->comm.surf_comm, category); } } #endif + +/** + * \brief Function to get the parameters of the given the SIMIX host. + * + * \param host the host to get_phys_host (a smx_host_t) + * \param param the parameter object space to be overwritten (a ws_params_t) + */ +void SIMIX_host_get_params(smx_host_t ind_vm, ws_params_t params) +{ + /* jump to ws_get_params(). */ + surf_workstation_model->extension.workstation.get_params(ind_vm, params); +} + +void SIMIX_pre_host_get_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_params_t params) +{ + SIMIX_host_get_params(ind_vm, params); + SIMIX_simcall_answer(simcall); +} + +void SIMIX_host_set_params(smx_host_t ind_vm, ws_params_t params) +{ + /* jump to ws_set_params(). */ + surf_workstation_model->extension.workstation.set_params(ind_vm, params); +} + +void SIMIX_pre_host_set_params(smx_simcall_t simcall, smx_host_t ind_vm, ws_params_t params) +{ + SIMIX_host_set_params(ind_vm, params); + SIMIX_simcall_answer(simcall); +}