use a typed extension for simix::Host

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

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 7bd578d..a75aea9 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -14,14 +14,13 @@
 #include "src/surf/HostImpl.hpp"
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
-#include "src/simix/smx_process_private.h"
+#include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.h"
 #include "src/surf/cpu_interface.hpp"
 #include "simgrid/s4u/host.hpp"
 #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,18 @@ 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 SIMIX_process_get_host(smx_proc);
+  return smx_proc->host;
 }
 
 void Host::turnOn() {
-  simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_host_on, this));
 }
 
 void Host::turnOff() {
-  simgrid::simix::kernel(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
 }
 
 bool Host::isOn() {
@@ -111,7 +110,7 @@ boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
 
 /** Get the properties assigned to a host */
 xbt_dict_t Host::properties() {
-  return simgrid::simix::kernel([&] {
+  return simgrid::simix::kernelImmediate([&] {
     simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
     return surf_host->getProperties();
   });
@@ -123,7 +122,7 @@ const char*Host::property(const char*key) {
   return surf_host->getProperty(key);
 }
 void Host::setProperty(const char*key, const char *value){
-  simgrid::simix::kernel([&] {
+  simgrid::simix::kernelImmediate([&] {
     simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
     surf_host->setProperty(key,value);
   });
@@ -132,15 +131,15 @@ void Host::setProperty(const char*key, const char *value){
 /** Get the processes attached to the host */
 xbt_swag_t Host::processes()
 {
-  return simgrid::simix::kernel([&]() {
-    return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+  return simgrid::simix::kernelImmediate([&]() {
+    return this->extension<simgrid::simix::Host>()->process_list;
   });
 }
 
 /** Get the peak power of a host */
 double Host::getPstateSpeedCurrent()
 {
-  return simgrid::simix::kernel([&] {
+  return simgrid::simix::kernelImmediate([&] {
     return this->pimpl_cpu->getPstateSpeedCurrent();
   });
 }
@@ -148,7 +147,7 @@ double Host::getPstateSpeedCurrent()
 /** Get one power peak (in flops/s) of a host at a given pstate */
 double Host::getPstateSpeed(int pstate_index)
 {
-  return simgrid::simix::kernel([&] {
+  return simgrid::simix::kernelImmediate([&] {
     return this->pimpl_cpu->getPstateSpeed(pstate_index);
   });
 }
@@ -165,7 +164,7 @@ int Host::coresCount() {
 /** @brief Set the pstate at which the host should run */
 void Host::setPstate(int pstate_index)
 {
-  simgrid::simix::kernel(std::bind(
+  simgrid::simix::kernelImmediate(std::bind(
       &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
   ));
 }
@@ -177,14 +176,14 @@ int Host::pstate()
 
 void Host::parameters(vm_params_t params)
 {
-  simgrid::simix::kernel([&]() {
+  simgrid::simix::kernelImmediate([&]() {
     this->extension<simgrid::surf::HostImpl>()->getParams(params);
   });
 }
 
 void Host::setParameters(vm_params_t params)
 {
-  simgrid::simix::kernel([&]() {
+  simgrid::simix::kernelImmediate([&]() {
     this->extension<simgrid::surf::HostImpl>()->setParams(params);
   });
 }
@@ -196,7 +195,7 @@ void Host::setParameters(vm_params_t params)
  */
 xbt_dict_t Host::mountedStoragesAsDict()
 {
-  return simgrid::simix::kernel([&] {
+  return simgrid::simix::kernelImmediate([&] {
     return this->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
   });
 }
@@ -208,7 +207,7 @@ xbt_dict_t Host::mountedStoragesAsDict()
  */
 xbt_dynar_t Host::attachedStorages()
 {
-  return simgrid::simix::kernel([&] {
+  return simgrid::simix::kernelImmediate([&] {
     return this->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
   });
 }