From 2a6c6f62af5b4823e5737e58f17150ce8dab1a95 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Mon, 11 Jan 2016 11:52:04 +0100 Subject: [PATCH] Remove SIMIX_host_get_current_power_peak() and SIMIX_host_get_power_peak_at() They are mere wrappers around the same surf_ calls. --- src/simgrid/host.cpp | 4 ++-- src/simix/smx_host.cpp | 8 -------- src/simix/smx_host_private.h | 2 -- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 3d1a48ab8c..1b3176c91a 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -215,14 +215,14 @@ xbt_swag_t Host::getProcessList() double Host::getCurrentPowerPeak() { return simgrid::simix::kernel( - std::bind(SIMIX_host_get_current_power_peak, this)); + std::bind(surf_host_get_current_power_peak, this)); } /** Get one power peak (in flops/s) of a host at a given pstate */ double Host::getPowerPeakAt(int pstate_index) { return simgrid::simix::kernel( - std::bind(SIMIX_host_get_power_peak_at, this, pstate_index)); + std::bind(surf_host_get_power_peak_at, this, pstate_index)); } /** @brief Get the speed of the cpu associated to a host */ diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index e9f1847a0c..6bea3c18af 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -166,14 +166,6 @@ const char* SIMIX_host_self_get_name(void) return SIMIX_host_get_name(host); } -double SIMIX_host_get_current_power_peak(sg_host_t host) { - return surf_host_get_current_power_peak(host); -} - -double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index) { - return surf_host_get_power_peak_at(host, pstate_index); -} - 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 9408ca1e32..5933ec2c13 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -37,8 +37,6 @@ XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host, XBT_PRIVATE void SIMIX_host_restart_processes(sg_host_t host); XBT_PRIVATE void SIMIX_host_autorestart(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 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