X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/23a00833ef66ff4383394e3cac558a5232d4bd62..b402376f49143b6c75515bd28b6610743c1a7dfc:/src/surf/surf_c_bindings.cpp?ds=inline diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index d317546497..365ce8a037 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -18,12 +18,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); * TOOLS * *********/ -static simgrid::surf::Host *get_casted_host(sg_host_t host){ - return static_cast(surf_host_resource_priv(host)); +static simgrid::surf::Host *get_casted_host(sg_host_t host){ //FIXME: killme + return host->extension(); } static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){ - return static_cast(surf_host_resource_priv(host)); + return static_cast(host->extension()); } extern double NOW; @@ -225,9 +225,7 @@ surf_action_t surf_host_model_execute_parallel_task(surf_host_model_t model, 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; - routing_platf->getRouteAndLatency( - get_casted_host(src)->p_netElm, - get_casted_host(dst)->p_netElm, &route, NULL); + routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, NULL); return route; } @@ -236,83 +234,30 @@ void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){ } surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_host_t src, sg_host_t dst, double size, double rate){ - return model->communicate(src->p_netcard, dst->p_netcard, size, rate); + return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate); } const char *surf_resource_name(surf_cpp_resource_t resource){ return resource->getName(); } -e_surf_resource_state_t surf_resource_get_state(surf_cpp_resource_t resource){ - return resource->getState(); -} - -void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state){ - resource->setState(state); -} - surf_action_t surf_host_sleep(sg_host_t host, double duration){ - return host->p_cpu->sleep(duration); + return host->pimpl_cpu->sleep(duration); } -xbt_dict_t sg_host_get_properties(sg_host_t host) { - return get_casted_host(host)->getProperties(); -} - -double surf_host_get_speed(sg_host_t host, double load){ - return host->p_cpu->getSpeed(load); -} double surf_host_get_available_speed(sg_host_t host){ - return host->p_cpu->getAvailableSpeed(); -} - -int surf_host_get_core(sg_host_t host){ - return host->p_cpu->getCore(); -} - -surf_action_t surf_host_execute(sg_host_t host, double size){ - return host->p_cpu->execute(size); + return host->pimpl_cpu->getAvailableSpeed(); } double surf_host_get_current_power_peak(sg_host_t host){ - return host->p_cpu->getCurrentPowerPeak(); + return host->pimpl_cpu->getCurrentPowerPeak(); } double surf_host_get_power_peak_at(sg_host_t host, int pstate_index){ - return host->p_cpu->getPowerPeakAt(pstate_index); + return host->pimpl_cpu->getPowerPeakAt(pstate_index); } -int surf_host_get_nb_pstates(sg_host_t host){ - return host->p_cpu->getNbPStates(); -} - -void surf_host_set_pstate(sg_host_t host, int pstate_index){ - host->p_cpu->setPState(pstate_index); -} -int surf_host_get_pstate(sg_host_t host){ - return host->p_cpu->getPState(); -} - -using simgrid::energy::HostEnergy; -using simgrid::energy::surf_energy; - -double surf_host_get_wattmin_at(sg_host_t resource, int pstate){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getWattMinAt(pstate); -} -double surf_host_get_wattmax_at(sg_host_t resource, int pstate){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getWattMaxAt(pstate); -} - -double surf_host_get_consumed_energy(sg_host_t resource){ - xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); - return hostIt->second->getConsumedEnergy(); -} xbt_dict_t surf_host_get_mounted_storage_list(sg_host_t host){ return get_casted_host(host)->getMountedStorageList(); @@ -385,9 +330,9 @@ void surf_host_set_params(sg_host_t host, vm_params_t params){ get_casted_host(host)->setParams(params); } -void surf_vm_destroy(sg_host_t vm){ - vm->p_cpu = nullptr; - delete vm->p_netcard; +void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE + vm->pimpl_cpu = nullptr; + vm->pimpl_netcard = nullptr; } void surf_vm_suspend(sg_host_t vm){ @@ -419,7 +364,7 @@ void surf_vm_set_bound(sg_host_t vm, double bound){ } void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){ - return get_casted_vm(vm)->setAffinity(host->p_cpu, mask); + return get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask); } xbt_dict_t surf_storage_get_content(surf_resource_t resource){ @@ -446,16 +391,6 @@ const char* surf_storage_get_host(surf_resource_t resource){ return static_cast(surf_storage_resource_priv(resource))->p_attach; } -surf_action_t surf_cpu_execute(sg_host_t host, double size){ - xbt_die("FIXME: DEADCODE"); - return host->p_cpu->execute(size); -} - -surf_action_t surf_cpu_sleep(sg_host_t host, double duration){ - xbt_die("FIXME: DEADCODE"); - return host->p_cpu->sleep(duration); -} - double surf_action_get_start_time(surf_action_t action){ return action->getStartTime(); } @@ -468,10 +403,6 @@ double surf_action_get_remains(surf_action_t action){ return action->getRemains(); } -void surf_action_unref(surf_action_t action){ - action->unref(); -} - void surf_action_suspend(surf_action_t action){ action->suspend(); } @@ -509,7 +440,7 @@ double surf_action_get_cost(surf_action_t action){ } void surf_cpu_action_set_affinity(surf_action_t action, sg_host_t host, unsigned long mask) { - static_cast(action)->setAffinity(host->p_cpu, mask); + static_cast(action)->setAffinity(host->pimpl_cpu, mask); } void surf_cpu_action_set_bound(surf_action_t action, double bound) { @@ -527,5 +458,5 @@ surf_file_t surf_storage_action_get_file(surf_action_t action){ } surf_host_t surf_host_resource_priv(sg_host_t host) { - return host->extension(simgrid::surf::Host::EXTENSION_ID); + return host->extension(); }