Remove SIMIX_host_get_current_power_peak() and SIMIX_host_get_power_peak_at()

They are mere wrappers around the same surf_ calls.

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 3d1a48a..1b3176c 100644 (file)
--- 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(
 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(
 }
 
 /** 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 */
 }
 
 /** @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 e9f1847..6bea3c1 100644 (file)
--- 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);
 }
 
   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;
 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 9408ca1..5933ec2 100644 (file)
--- 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 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,
 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,