X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2bdebbaf8391c3b5dc1cd193491504f83bb2ea3e..0b364cf4c773d809e4ca7a8d8998ee54f5f7ebfe:/src/s4u/s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 8701353b5d..b9971952df 100644
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -29,6 +29,11 @@ int ROUTING_HOST_LEVEL;
 int USER_HOST_LEVEL;
 
 namespace simgrid {
+
+namespace xbt {
+template class Extendable<simgrid::s4u::Host>;
+}
+
 namespace s4u {
 
 simgrid::xbt::signal<void(Host&)> Host::onCreation;
@@ -41,17 +46,30 @@ Host::Host(const char* name)
 }
 
 Host::~Host() {
-	if (mounts != NULL)
-		delete mounts;
+	delete pimpl_cpu;
+	delete mounts;
 }
 
-Host *Host::byName(std::string name) {
+Host *Host::by_name(std::string name) {
 	Host* host = Host::by_name_or_null(name.c_str());
 	// TODO, raise an exception instead?
 	if (host == nullptr)
 		xbt_die("No such host: %s", name.c_str());
 	return host;
 }
+Host* Host::by_name_or_null(const char* name)
+{
+  return (Host*) xbt_dict_get_or_null(host_list, name);
+}
+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);
+  }
+  return host;
+}
 
 Host *Host::current(){
 	smx_process_t smx_proc = SIMIX_process_self();
@@ -60,27 +78,27 @@ Host *Host::current(){
 	return SIMIX_process_get_host(smx_proc);
 }
 
-void Host::turnOn() {
+void Host::turn_on() {
 	simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
 }
 
-void Host::turnOff() {
-	simgrid::simix::simcall<void>(SIMCALL_HOST_OFF, this);
+void Host::turn_off() {
+  simgrid::simix::kernel(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
 }
 
-bool Host::isOn() {
+bool Host::is_on() {
 	return this->pimpl_cpu->isOn();
 }
 
-int Host::getNbPStates() const {
+int Host::pstates_count() const {
 	return this->pimpl_cpu->getNbPStates();
 }
 
-boost::unordered_map<std::string, Storage*> &Host::mountedStorages() {
+boost::unordered_map<std::string, Storage*> const& Host::mounted_storages() {
 	if (mounts == NULL) {
 		mounts = new boost::unordered_map<std::string, Storage*> ();
 
-		xbt_dict_t dict = this->getMountedStorageList();
+		xbt_dict_t dict = this->mounted_storages_as_dict();
 
 		xbt_dict_cursor_t cursor;
 		char *mountname;
@@ -95,7 +113,7 @@ boost::unordered_map<std::string, Storage*> &Host::mountedStorages() {
 }
 
 /** Get the properties assigned to a host */
-xbt_dict_t Host::getProperties() {
+xbt_dict_t Host::properties() {
   return simgrid::simix::kernel([&] {
 		simgrid::surf::Host* surf_host = this->extension<simgrid::surf::Host>();
 		return surf_host->getProperties();
@@ -103,7 +121,7 @@ xbt_dict_t Host::getProperties() {
 }
 
 /** Get the processes attached to the host */
-xbt_swag_t Host::getProcessList()
+xbt_swag_t Host::processes()
 {
   return simgrid::simix::kernel([&]() {
     return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
@@ -111,7 +129,7 @@ xbt_swag_t Host::getProcessList()
 }
 
 /** Get the peak power of a host */
-double Host::getCurrentPowerPeak()
+double Host::current_power_peak()
 {
   return simgrid::simix::kernel([&] {
     return this->pimpl_cpu->getCurrentPowerPeak();
@@ -119,7 +137,7 @@ double Host::getCurrentPowerPeak()
 }
 
 /** Get one power peak (in flops/s) of a host at a given pstate */
-double Host::getPowerPeakAt(int pstate_index)
+double Host::power_peak_at(int pstate_index)
 {
   return simgrid::simix::kernel([&] {
     return this->pimpl_cpu->getPowerPeakAt(pstate_index);
@@ -127,50 +145,35 @@ double Host::getPowerPeakAt(int pstate_index)
 }
 
 /** @brief Get the speed of the cpu associated to a host */
-double Host::getSpeed() {
+double Host::speed() {
 	return pimpl_cpu->getSpeed(1.0);
 }
 /** @brief Returns the number of core of the processor. */
-int Host::getCoreAmount() {
+int Host::core_count() {
 	return pimpl_cpu->getCore();
 }
 
-Host* Host::by_name_or_null(const char* name)
-{
-  return (Host*) xbt_dict_get_or_null(host_list, name);
-}
-
-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);
-  }
-  return host;
-}
-
 /** @brief Set the pstate at which the host should run */
-void Host::setPState(int pstate_index)
+void Host::set_pstate(int pstate_index)
 {
   simgrid::simix::kernel(std::bind(
       &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
   ));
 }
 /** @brief Retrieve the pstate at which the host is currently running */
-int Host::getPState()
+int Host::pstate()
 {
   return pimpl_cpu->getPState();
 }
 
-void Host::getParams(vm_params_t params)
+void Host::get_parameters(vm_params_t params)
 {
   simgrid::simix::kernel([&]() {
     this->extension<simgrid::surf::Host>()->getParams(params);
   });
 }
 
-void Host::setParams(vm_params_t params)
+void Host::set_parameters(vm_params_t params)
 {
   simgrid::simix::kernel([&]() {
     this->extension<simgrid::surf::Host>()->setParams(params);
@@ -182,7 +185,7 @@ void Host::setParams(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::getMountedStorageList()
+xbt_dict_t Host::mounted_storages_as_dict()
 {
   return simgrid::simix::kernel([&] {
     return this->extension<simgrid::surf::Host>()->getMountedStorageList();
@@ -194,7 +197,7 @@ xbt_dict_t Host::getMountedStorageList()
  * \brief Returns the list of storages attached to an host.
  * \return a dict containing all storages attached to the host
  */
-xbt_dynar_t Host::getAttachedStorageList()
+xbt_dynar_t Host::attached_storages()
 {
   return simgrid::simix::kernel([&] {
     return this->extension<simgrid::surf::Host>()->getAttachedStorageList();