X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2211665cb451243f182fa49a18219331d9bf58d6..94a170e381053a22750c59f5101c73ae263b3bf3:/src/simix/smx_host.c diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c index 1fb5227446..982545b254 100644 --- a/src/simix/smx_host.c +++ b/src/simix/smx_host.c @@ -20,9 +20,8 @@ static void SIMIX_execution_finish(smx_synchro_t synchro); * \brief Internal function to create a SIMIX host. * \param name name of the host to create */ -void SIMIX_host_create(const char *name) // FIXME: braindead prototype. Take sg_host as parameter +void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_host as parameter { - sg_host_t host = xbt_lib_get_elm_or_null(host_lib, name); smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1); s_smx_process_t proc; @@ -105,7 +104,7 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer) 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->host), issuer->name); + XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_get_name(process->host), issuer->name); } } } @@ -182,11 +181,6 @@ double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index) { return surf_host_get_power_peak_at(host, pstate_index); } -int SIMIX_host_get_nb_pstates(sg_host_t host) { - return surf_host_get_nb_pstates(host); -} - - void SIMIX_host_set_pstate(sg_host_t host, int pstate_index) { surf_host_set_pstate(host, pstate_index); } @@ -247,9 +241,9 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host, arg->auto_restart = auto_restart; if( sg_host_get_state(host) == SURF_RESOURCE_OFF - && !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 pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_name(host)); + && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){ + xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,NULL); + XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host)); } xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg); } @@ -495,7 +489,7 @@ void SIMIX_execution_finish(smx_synchro_t synchro) break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_name(simcall->issuer->host)); + XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_get_name(simcall->issuer->host)); simcall->issuer->context->iwannadie = 1; SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break;