X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/efd5719fdcd06a99d1fd644b81c7e9d578c08fc5..097befdbebacea302be3a7442afce30ae1a26937:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 32194f9ef8..0625177fcc 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -47,47 +47,47 @@ void simcall_call(smx_process_t process) * \deprecated */ xbt_swag_t simcall_host_get_process_list(sg_host_t host) { - return host->getProcessList(); + return host->processes(); } /** \ingroup simix_host_management * \deprecated */ double simcall_host_get_current_power_peak(sg_host_t host) { - return host->getCurrentPowerPeak(); + return host->current_power_peak(); } /** \ingroup simix_host_management * \deprecated */ double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index) { - return host->getPowerPeakAt(pstate_index); + return host->power_peak_at(pstate_index); } /** \deprecated */ void simcall_host_get_params(sg_host_t vm, vm_params_t params) { - vm->getParams(params); + vm->get_parameters(params); } /** \deprecated */ void simcall_host_set_params(sg_host_t vm, vm_params_t params) { - vm->setParams(params); + vm->set_parameters(params); } /** \ingroup simix_storage_management * \deprecated */ xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host) { - return host->getMountedStorageList(); + return host->mounted_storages_as_dict(); } /** \ingroup simix_storage_management * \deprecated */ xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host) { - return host->getAttachedStorageList(); + return host->attached_storages(); } // ***** Other simcalls @@ -155,11 +155,13 @@ smx_synchro_t simcall_process_parallel_execute(const char *name, int i,j; /* checking for infinite values */ for (i = 0 ; i < host_nb ; ++i) { - xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i); - for (j = 0 ; j < host_nb ; ++j) { + xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i); + if (bytes_amount != NULL) { + for (j = 0 ; j < host_nb ; ++j) { xbt_assert(std::isfinite(bytes_amount[i + host_nb * j]), - "bytes_amount[%d+%d*%d] is not finite!", i, host_nb, j); - } + "bytes_amount[%d+%d*%d] is not finite!", i, host_nb, j); + } + } } xbt_assert(std::isfinite(amount), "amount is not finite!");