From 48358ed87fd24b70850ed140ea72e40cf8e04df2 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 9 Jan 2016 23:08:20 +0100 Subject: [PATCH 1/1] kill useless code --- src/include/surf/surf.h | 17 ----------------- src/simix/smx_host.cpp | 4 ++-- src/surf/surf_c_bindings.cpp | 13 ------------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index c5f4f048e9..b7d707e7e5 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -301,23 +301,6 @@ static inline const char * surf_cpu_name(surf_cpu_t cpu) { /** @brief Get the properties of an host */ XBT_PUBLIC(xbt_dict_t) sg_host_get_properties(sg_host_t host); - -/** @brief Get the state of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(int) surf_resource_is_on(surf_cpp_resource_t resource); -/** @brief Get the state of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(int) surf_resource_is_off(surf_cpp_resource_t resource); - -/** @brief Set the state of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(void) surf_resource_turn_on(surf_cpp_resource_t resource); -/** @brief Set the state of a surf resource (cpu, host, network, …) */ -XBT_PUBLIC(void) surf_resource_turn_off(surf_cpp_resource_t resource); -static inline void surf_host_turn_on(surf_host_t host) { - surf_resource_turn_on((surf_cpp_resource_t)host); -} -static inline void surf_host_turn_off(surf_host_t host) { - surf_resource_turn_off((surf_cpp_resource_t)host); -} - /** @brief Get the available speed of cpu associated to a host */ XBT_PUBLIC(double) surf_host_get_available_speed(sg_host_t host); diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 17ae79b2ac..a6c4cb93b2 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -46,7 +46,7 @@ void SIMIX_host_on(sg_host_t h) if (h->isOff()) { simgrid::surf::Host* surf_host = h->extension(); - surf_host_turn_on(surf_host); + surf_host->turnOn(); unsigned int cpt; smx_process_arg_t arg; @@ -100,7 +100,7 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer) if (h->isOn()) { simgrid::surf::Host* surf_host = h->extension(); - surf_host_turn_off(surf_host); + surf_host->turnOff(); /* Clean Simulator data */ if (xbt_swag_size(host->process_list) != 0) { diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 66dc64d554..75f095fb6e 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -243,19 +243,6 @@ const char *surf_resource_name(surf_cpp_resource_t resource){ return resource->getName(); } -int surf_resource_is_on(surf_cpp_resource_t resource){ - return resource->isOn(); -} -int surf_resource_is_off(surf_cpp_resource_t resource){ - return resource->isOff(); -} -void surf_resource_turn_on(surf_cpp_resource_t resource){ - resource->turnOn(); -} -void surf_resource_turn_off(surf_cpp_resource_t resource){ - resource->turnOff(); -} - surf_action_t surf_host_sleep(sg_host_t host, double duration){ return host->p_cpu->sleep(duration); } -- 2.20.1