From 285edaf25bfcba0acdfe74715cb0f48acf644f40 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Thu, 8 Sep 2016 14:26:31 +0200 Subject: [PATCH] [SURF/S4U] Rename Cpu::getCore() to Cpu::getCoreCount() --- src/s4u/s4u_host.cpp | 2 +- src/surf/cpu_interface.cpp | 3 +-- src/surf/cpu_interface.hpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index d38b8e03f2..7d13e3385c 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -165,7 +165,7 @@ double Host::speed() { } /** @brief Returns the number of core of the processor. */ int Host::coresCount() { - return pimpl_cpu->getCore(); + return pimpl_cpu->getCoreCount(); } /** @brief Set the pstate at which the host should run */ diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index 34270964df..ed4f8dd4a3 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -203,8 +203,7 @@ void Cpu::onSpeedChange() { TRACE_surf_host_set_speed(surf_get_clock(), getName(), coresAmount_ * speed_.scale * speed_.peak); } - -int Cpu::getCore() +int Cpu::getCoreCount() { return coresAmount_; } diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 5e856572da..9ddf06aa77 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -106,7 +106,7 @@ public: virtual simgrid::surf::Action *sleep(double duration)=0; /** @brief Get the amount of cores */ - virtual int getCore(); + virtual int getCoreCount(); /** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */ virtual double getSpeed(double load); -- 2.20.1