X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/580571dfe8586fd74fd66b948d03dbddfb6f58d3..e058e06362ce27135c41d3657840f9fd78667687:/src/surf/host_interface.cpp

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index a4367e1e9f..dcacf5221a 100644
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -6,7 +6,7 @@
 
 #include "host_interface.hpp"
 
-#include <simgrid/Host.hpp>
+#include <simgrid/s4u/host.hpp>
 
 #include "src/simix/smx_private.h"
 #include "cpu_cas01.hpp"
@@ -31,7 +31,7 @@ void host_add_traces(){
 namespace simgrid {
 namespace surf {
 
-simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
+simgrid::xbt::Extension<simgrid::s4u::Host, Host> Host::EXTENSION_ID;
 
 /*********
  * Model *
@@ -82,20 +82,16 @@ void HostModel::adjustWeightOfDummyCpuActions()
 /************
  * Resource *
  ************/
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onCreation;
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onDestruction;
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onStateChange;
+
 
 void Host::classInit()
 {
   if (!EXTENSION_ID.valid()) {
-    EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
-    	static_cast<simgrid::surf::Host*>(h)->destroy();
-    });
+    EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::Host>();
   }
 }
 
-Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
+Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
 		                 xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name)
  , PropertyHolder(props)
@@ -104,7 +100,7 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
   p_params.ramsize = 0;
 }
 
-Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
+Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
 				         xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name, constraint)
  , PropertyHolder(props)
@@ -116,32 +112,14 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_
 /** @brief use destroy() instead of this destructor */
 Host::~Host()
 {
-	xbt_assert(currentlyDestroying_, "Don't delete Hosts directly. Call destroy() instead.");
-	delete p_cpu;
-	// FIXME: VM plays strange games, leading to segfaults if I do the expected thing of next line
-	// delete p_netElm;
-	// delete p_storage;
-}
-/** @brief Fire the require callbacks and destroy the object
- *
- * Don't delete directly an Host, call h->destroy() instead.
- */
-void Host::destroy()
-{
-	if (!currentlyDestroying_) {
-		currentlyDestroying_ = true;
-		onDestruction(this);
-		delete this;
-	}
 }
 
-void Host::attach(simgrid::Host* host)
+void Host::attach(simgrid::s4u::Host* host)
 {
   if (p_host != nullptr)
-    xbt_die("Already attached to host %s", host->getName().c_str());
+    xbt_die("Already attached to host %s", host->name().c_str());
   host->extension_set(this);
   p_host = host;
-  onCreation(this);
 }
 
 bool Host::isOn() {
@@ -153,13 +131,13 @@ bool Host::isOff() {
 void Host::turnOn(){
   if (isOff()) {
     p_cpu->turnOn();
-    onStateChange(this);
+    simgrid::s4u::Host::onStateChange(*this->p_host);
   }
 }
 void Host::turnOff(){
   if (isOn()) {
     p_cpu->turnOff();
-    onStateChange(this);
+    simgrid::s4u::Host::onStateChange(*this->p_host);
   }
 }