From 7940e7c1b0f2897a82628c707408ad49debd1d3b Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 10 Jan 2016 01:06:55 +0100 Subject: [PATCH 1/1] kill two more useless calls --- src/simgrid/host.cpp | 10 ++++++---- src/simix/smx_host.cpp | 7 ------- src/simix/smx_host_private.h | 2 -- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 61de1034ea..b3f5bd6962 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -259,15 +259,17 @@ void Host::setPstate(int pstate_index) /** Get the amount of watt dissipated at the given pstate when the host is idling */ double Host::getWattMinAt(int pstate) { - return simgrid::simix::kernel( - std::bind(SIMIX_host_get_wattmin_at, this, pstate)); + return simgrid::simix::kernel(std::bind( + surf_host_get_wattmin_at, this, pstate + )); } /** Get the amount of watt dissipated at the given pstate when the host burns CPU at 100% */ double Host::getWattMaxAt(int pstate) { - return simgrid::simix::kernel( - std::bind(SIMIX_host_get_wattmax_at, this, pstate)); + return simgrid::simix::kernel(std::bind( + surf_host_get_wattmax_at, this, pstate + )); } void Host::getParams(vm_params_t params) diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 4a5bf18133..91b7ef9f73 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -186,13 +186,6 @@ double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index) { return surf_host_get_power_peak_at(host, pstate_index); } -double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) { - return surf_host_get_wattmin_at(host,pstate); -} -double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate) { - return surf_host_get_wattmax_at(host,pstate); -} - void _SIMIX_host_free_process_arg(void *data) { smx_process_arg_t arg = *(smx_process_arg_t*)data; diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 5d25ef4f39..0709849d95 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -41,8 +41,6 @@ XBT_PRIVATE xbt_dict_t SIMIX_host_get_properties(sg_host_t host); XBT_PRIVATE xbt_swag_t SIMIX_host_get_process_list(sg_host_t host); XBT_PRIVATE double SIMIX_host_get_current_power_peak(sg_host_t host); XBT_PRIVATE double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index); -XBT_PRIVATE double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate); -XBT_PRIVATE double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate); XBT_PRIVATE smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name, double flops_amount, double priority, double bound, unsigned long affinity_mask); XBT_PRIVATE smx_synchro_t SIMIX_process_parallel_execute(const char *name, -- 2.20.1