X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e0879e02f32153ee997c27cbe0255309a2668db..71c619779ed661b50ce589403a0f4df7ab0865de:/src/surf/host_interface.cpp

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 5899b0186d..8772f95300 100644
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -31,15 +31,19 @@ void host_add_traces(){
 namespace simgrid {
 namespace surf {
 
-simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
+simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID =
+		simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
+	        static_cast<simgrid::surf::Host*>(h)->destroy();
+        });
 
 /*********
  * Model *
  *********/
-Host *HostModel::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props){
+Host *HostModel::createHost(const char *name,NetCard *netElm, Cpu *cpu, xbt_dict_t props){
+  xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL);
+
   Host *host = new simgrid::surf::Host(surf_host_model, name, props,
-		  (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
-		  netElm, cpu);
+		  storageList, netElm, cpu);
   XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
   return host;
 }
@@ -86,18 +90,8 @@ 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*, e_surf_resource_state_t, e_surf_resource_state_t)> 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();
-    });
-    SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME
-  }
-}
-
 Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
-		                 xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
+		                 xbt_dynar_t storage, NetCard *netElm, Cpu *cpu)
  : Resource(model, name)
  , PropertyHolder(props)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
@@ -106,7 +100,7 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
 }
 
 Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
-				         xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
+				         xbt_dynar_t storage, NetCard *netElm, Cpu *cpu)
  : Resource(model, name, constraint)
  , PropertyHolder(props)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
@@ -118,6 +112,10 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_
 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
  *
@@ -151,13 +149,6 @@ void Host::setState(e_surf_resource_state_t state){
   p_cpu->setState(state);
 }
 
-Action *Host::execute(double size) {
-  return p_cpu->execute(size);
-}
-Action *Host::sleep(double duration) {
-  return p_cpu->sleep(duration);
-}
-
 
 simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
 {