X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b402376f49143b6c75515bd28b6610743c1a7dfc..be9b5df7a79fbca7953c3cc730185959834940bf:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 365ce8a037..8b71301867 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -169,13 +169,6 @@ void routing_get_route_and_latency(sg_netcard_t src, sg_netcard_t dst, * MODEL * *********/ -surf_host_model_t surf_host_get_model(sg_host_t host) -{ - simgrid::surf::Host* surf_host = - (simgrid::surf::Host*) host->extension(); - return (surf_host_model_t) surf_host->getModel(); -} - surf_action_t surf_model_extract_done_action_set(surf_model_t model){ if (model->getDoneActionSet()->empty()) return NULL; @@ -212,16 +205,6 @@ int surf_model_running_action_set_size(surf_model_t model){ return model->getRunningActionSet()->size(); } -surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model, - int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double rate){ - return static_cast( - model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate)); -} - xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/, sg_host_t src, sg_host_t dst){ xbt_dynar_t route = NULL; @@ -250,19 +233,6 @@ double surf_host_get_available_speed(sg_host_t host){ return host->pimpl_cpu->getAvailableSpeed(); } -double surf_host_get_current_power_peak(sg_host_t host){ - return host->pimpl_cpu->getCurrentPowerPeak(); -} - -double surf_host_get_power_peak_at(sg_host_t host, int pstate_index){ - return host->pimpl_cpu->getPowerPeakAt(pstate_index); -} - - -xbt_dict_t surf_host_get_mounted_storage_list(sg_host_t host){ - return get_casted_host(host)->getMountedStorageList(); -} - xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){ return get_casted_host(host)->getAttachedStorageList(); } @@ -314,7 +284,7 @@ xbt_dynar_t surf_host_get_vms(sg_host_t host){ unsigned int cpt; simgrid::surf::VirtualMachine *vm; xbt_dynar_foreach(vms, cpt, vm) { - // TODO, use a backlink from simgrid::surf::Host to simgrid::Host + // TODO, use a backlink from simgrid::surf::Host to simgrid::s4u::Host sg_host_t vm_ = (sg_host_t) xbt_dict_get_elm_or_null(host_list, vm->getName()); xbt_dynar_push(vms_, &vm_); } @@ -456,7 +426,3 @@ double surf_network_action_get_latency_limited(surf_action_t action) { surf_file_t surf_storage_action_get_file(surf_action_t action){ return static_cast(action)->p_file; } - -surf_host_t surf_host_resource_priv(sg_host_t host) { - return host->extension(); -}