X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16bbb8a8212497d9c44c81333ed2c0e689e0c5af..90f32f7c90becc16c9d62c3e2aee19b904698b3d:/src/s4u/s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 7aaf021268..a75aea9657 100644
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -10,23 +10,18 @@
 
 #include <unordered_map>
 
-#include <simgrid/simix.hpp>
-
+#include "simgrid/simix.hpp"
+#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/smx_private.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.h"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/host_interface.hpp"
-
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"
 
-int MSG_HOST_LEVEL;
-int SD_HOST_LEVEL;
-int SIMIX_HOST_LEVEL;
-int ROUTING_HOST_LEVEL;
-int USER_HOST_LEVEL;
+int MSG_HOST_LEVEL = -1;
+int USER_HOST_LEVEL = -1;
 
 namespace simgrid {
 
@@ -47,6 +42,7 @@ Host::Host(const char* name)
 
 Host::~Host() {
   delete pimpl_cpu;
+  delete pimpl_netcard;
   delete mounts;
 }
 
@@ -66,39 +62,39 @@ Host* Host::by_name_or_create(const char* name)
   Host* host = by_name_or_null(name);
   if (host == nullptr) {
     host = new Host(name);
-    xbt_dict_set(host_list, name, host, NULL);
+    xbt_dict_set(host_list, name, host, nullptr);
   }
   return host;
 }
 
 Host *Host::current(){
-  smx_process_t smx_proc = SIMIX_process_self();
-  if (smx_proc == NULL)
+  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::turn_on() {
-  simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
+void Host::turnOn() {
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_host_on, this));
 }
 
-void Host::turn_off() {
-  simgrid::simix::kernel(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+void Host::turnOff() {
+  simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
 }
 
-bool Host::is_on() {
+bool Host::isOn() {
   return this->pimpl_cpu->isOn();
 }
 
-int Host::pstates_count() const {
+int Host::pstatesCount() const {
   return this->pimpl_cpu->getNbPStates();
 }
 
-boost::unordered_map<std::string, Storage*> const& Host::mounted_storages() {
-  if (mounts == NULL) {
+boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
+  if (mounts == nullptr) {
     mounts = new boost::unordered_map<std::string, Storage*> ();
 
-    xbt_dict_t dict = this->mounted_storages_as_dict();
+    xbt_dict_t dict = this->mountedStoragesAsDict();
 
     xbt_dict_cursor_t cursor;
     char *mountname;
@@ -114,33 +110,45 @@ boost::unordered_map<std::string, Storage*> const& Host::mounted_storages() {
 
 /** Get the properties assigned to a host */
 xbt_dict_t Host::properties() {
-  return simgrid::simix::kernel([&] {
-    simgrid::surf::Host* surf_host = this->extension<simgrid::surf::Host>();
+  return simgrid::simix::kernelImmediate([&] {
+    simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
     return surf_host->getProperties();
   });
 }
 
+/** Retrieve the property value (or nullptr if not set) */
+const char*Host::property(const char*key) {
+  simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
+  return surf_host->getProperty(key);
+}
+void Host::setProperty(const char*key, const char *value){
+  simgrid::simix::kernelImmediate([&] {
+    simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
+    surf_host->setProperty(key,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::current_power_peak()
+double Host::getPstateSpeedCurrent()
 {
-  return simgrid::simix::kernel([&] {
-    return this->pimpl_cpu->getCurrentPowerPeak();
+  return simgrid::simix::kernelImmediate([&] {
+    return this->pimpl_cpu->getPstateSpeedCurrent();
   });
 }
 
 /** Get one power peak (in flops/s) of a host at a given pstate */
-double Host::power_peak_at(int pstate_index)
+double Host::getPstateSpeed(int pstate_index)
 {
-  return simgrid::simix::kernel([&] {
-    return this->pimpl_cpu->getPowerPeakAt(pstate_index);
+  return simgrid::simix::kernelImmediate([&] {
+    return this->pimpl_cpu->getPstateSpeed(pstate_index);
   });
 }
 
@@ -149,14 +157,14 @@ double Host::speed() {
   return pimpl_cpu->getSpeed(1.0);
 }
 /** @brief Returns the number of core of the processor. */
-int Host::core_count() {
+int Host::coresCount() {
   return pimpl_cpu->getCore();
 }
 
 /** @brief Set the pstate at which the host should run */
-void Host::set_pstate(int pstate_index)
+void Host::setPstate(int pstate_index)
 {
-  simgrid::simix::kernel(std::bind(
+  simgrid::simix::kernelImmediate(std::bind(
       &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
   ));
 }
@@ -166,17 +174,17 @@ int Host::pstate()
   return pimpl_cpu->getPState();
 }
 
-void Host::get_parameters(vm_params_t params)
+void Host::parameters(vm_params_t params)
 {
-  simgrid::simix::kernel([&]() {
-    this->extension<simgrid::surf::Host>()->getParams(params);
+  simgrid::simix::kernelImmediate([&]() {
+    this->extension<simgrid::surf::HostImpl>()->getParams(params);
   });
 }
 
-void Host::set_parameters(vm_params_t params)
+void Host::setParameters(vm_params_t params)
 {
-  simgrid::simix::kernel([&]() {
-    this->extension<simgrid::surf::Host>()->setParams(params);
+  simgrid::simix::kernelImmediate([&]() {
+    this->extension<simgrid::surf::HostImpl>()->setParams(params);
   });
 }
 
@@ -185,10 +193,10 @@ void Host::set_parameters(vm_params_t params)
  * \brief Returns the list of storages mounted on an host.
  * \return a dict containing all storages mounted on the host
  */
-xbt_dict_t Host::mounted_storages_as_dict()
+xbt_dict_t Host::mountedStoragesAsDict()
 {
-  return simgrid::simix::kernel([&] {
-    return this->extension<simgrid::surf::Host>()->getMountedStorageList();
+  return simgrid::simix::kernelImmediate([&] {
+    return this->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
   });
 }
 
@@ -197,10 +205,10 @@ xbt_dict_t Host::mounted_storages_as_dict()
  * \brief Returns the list of storages attached to an host.
  * \return a dict containing all storages attached to the host
  */
-xbt_dynar_t Host::attached_storages()
+xbt_dynar_t Host::attachedStorages()
 {
-  return simgrid::simix::kernel([&] {
-    return this->extension<simgrid::surf::Host>()->getAttachedStorageList();
+  return simgrid::simix::kernelImmediate([&] {
+    return this->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
   });
 }