[SURF/S4U] Rename Cpu::getCore() to Cpu::getCoreCount()

[simgrid.git] / src / s4u / s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index e4d3d6c..7d13e33 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -21,7 +21,6 @@
 #include "simgrid/s4u/storage.hpp"
 
 int MSG_HOST_LEVEL = -1;
-int SIMIX_HOST_LEVEL = -1;
 int USER_HOST_LEVEL = -1;
 
 namespace simgrid {
@@ -69,18 +68,25 @@ Host* Host::by_name_or_create(const char* name)
 }
 
 Host *Host::current(){
-  smx_process_t smx_proc = SIMIX_process_self();
+  smx_actor_t smx_proc = SIMIX_process_self();
   if (smx_proc == nullptr)
     xbt_die("Cannot call Host::current() from the maestro context");
   return smx_proc->host;
 }
 
 void Host::turnOn() {
-  simgrid::simix::kernelImmediate(std::bind(SIMIX_host_on, this));
+  if (isOff()) {
+    simgrid::simix::kernelImmediate([&]{
+      this->extension<simgrid::simix::Host>()->turnOn();
+      this->extension<simgrid::surf::HostImpl>()->turnOn();
+    });
+  }
 }
 
 void Host::turnOff() {
-  simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+  if (isOn()) {
+    simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+  }
 }
 
 bool Host::isOn() {
@@ -133,7 +139,7 @@ void Host::setProperty(const char*key, const char *value){
 xbt_swag_t Host::processes()
 {
   return simgrid::simix::kernelImmediate([&]() {
-    return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+    return this->extension<simgrid::simix::Host>()->process_list;
   });
 }
 
@@ -159,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 */