X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48358ed87fd24b70850ed140ea72e40cf8e04df2..e6f32ee88c53d311ae1aaf409b886c60307a0af4:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index a6c4cb93b2..e9f1847a0c 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -166,18 +166,6 @@ const char* SIMIX_host_self_get_name(void) return SIMIX_host_get_name(host); } -xbt_dict_t SIMIX_host_get_properties(sg_host_t host){ - return sg_host_get_properties(host); -} - - -xbt_swag_t SIMIX_host_get_process_list(sg_host_t host){ - smx_host_priv_t host_priv = sg_host_simix(host); - - return host_priv->process_list; -} - - double SIMIX_host_get_current_power_peak(sg_host_t host) { return surf_host_get_current_power_peak(host); } @@ -186,16 +174,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); } -void SIMIX_host_set_pstate(sg_host_t host, int pstate_index) { - surf_host_set_pstate(host, pstate_index); -} -double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) { - return surf_host_get_wattmin_at(host,pstate); -} -double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate) { - return surf_host_get_wattmax_at(host,pstate); -} - void _SIMIX_host_free_process_arg(void *data) { smx_process_arg_t arg = *(smx_process_arg_t*)data; @@ -323,7 +301,7 @@ smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name, /* set surf's action */ if (!MC_is_active() && !MC_record_replay_is_active()) { - synchro->execution.surf_exec = surf_host_execute(issuer->host, flops_amount); + synchro->execution.surf_exec = issuer->host->pimpl_cpu->execute(flops_amount); synchro->execution.surf_exec->setData(synchro); synchro->execution.surf_exec->setPriority(priority); @@ -335,7 +313,7 @@ smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name, /* just a double check to confirm that this host is the host where this task is running. */ xbt_assert(synchro->execution.host == issuer->host); static_cast(synchro->execution.surf_exec) - ->setAffinity(issuer->host->p_cpu, affinity_mask); + ->setAffinity(issuer->host->pimpl_cpu, affinity_mask); } } @@ -442,7 +420,7 @@ void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, /* just a double check to confirm that this host is the host where this task is running. */ xbt_assert(synchro->execution.host == host); static_cast(synchro->execution.surf_exec) - ->setAffinity(host->p_cpu, mask); + ->setAffinity(host->pimpl_cpu, mask); } }