From 0e144fe25775e62cfb13074251d435f760cc6e12 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 26 Dec 2015 09:57:41 +0100 Subject: [PATCH] empty surf::Host into simgrid::Host --- src/surf/host_interface.cpp | 2 ++ src/surf/surf_c_bindings.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp index 5899b0186d..50afd769c8 100644 --- a/src/surf/host_interface.cpp +++ b/src/surf/host_interface.cpp @@ -152,9 +152,11 @@ void Host::setState(e_surf_resource_state_t state){ } Action *Host::execute(double size) { + xbt_assert(0,"FIXME: DEADCODE"); return p_cpu->execute(size); } Action *Host::sleep(double duration) { + xbt_assert(0,"FIXME: DEADCODE"); return p_cpu->sleep(duration); } diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 8002a4511a..f9d25d9bdc 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 resource){ - return static_cast(surf_host_resource_priv(resource)); +static simgrid::surf::Host *get_casted_host(sg_host_t host){ + return static_cast(surf_host_resource_priv(host)); } -static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t resource){ - return static_cast(surf_host_resource_priv(resource)); +static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){ + return static_cast(surf_host_resource_priv(host)); } extern double NOW; @@ -252,7 +252,7 @@ void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state } surf_action_t surf_host_sleep(sg_host_t host, double duration){ - return get_casted_host(host)->sleep(duration); + return host->extension(simgrid::surf::Cpu::EXTENSION_ID)->sleep(duration); } xbt_dict_t sg_host_get_properties(sg_host_t host) { @@ -272,7 +272,7 @@ int surf_host_get_core(sg_host_t host){ } surf_action_t surf_host_execute(sg_host_t host, double size){ - return get_casted_host(host)->execute(size); + return host->extension(simgrid::surf::Cpu::EXTENSION_ID)->execute(size); } double surf_host_get_current_power_peak(sg_host_t host){ -- 2.20.1