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

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 3d08ac4e44..8772f95300 100644
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -31,11 +31,22 @@ 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,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,
+		  storageList, netElm, cpu);
+  XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
+  return host;
+}
 
 /* Each VM has a dummy CPU action on the PM layer. This CPU action works as the
  * constraint (capacity) of the VM in the PM layer. If the VM does not have any
@@ -79,16 +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::init()
-{
-  if (!EXTENSION_ID.valid()) {
-    EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>();
-    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)
@@ -97,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)
@@ -105,26 +108,40 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_
   p_params.ramsize = 0;
 }
 
-void Host::onDie()
+/** @brief use destroy() instead of this destructor */
+Host::~Host()
 {
-  onDestruction(this);
-  Resource::onDie();
+	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;
 }
-
-Host::~Host()
+/** @brief Fire the require callbacks and destroy the object
+ *
+ * Don't delete directly an Host, call h->destroy() instead.
+ */
+void Host::destroy()
 {
-  this->die();
+	if (!currentlyDestroying_) {
+		currentlyDestroying_ = true;
+		onDestruction(this);
+		delete this;
+	}
 }
 
 void Host::attach(simgrid::Host* host)
 {
   if (p_host != nullptr)
-    xbt_die("Already attached to host %s", host->id().c_str());
+    xbt_die("Already attached to host %s", host->getName().c_str());
   host->extension_set(this);
   p_host = host;
   onCreation(this);
 }
 
+e_surf_resource_state_t Host::getState() {
+  return p_cpu->getState();
+}
 void Host::setState(e_surf_resource_state_t state){
   e_surf_resource_state_t old = Resource::getState();
   Resource::setState(state);
@@ -132,6 +149,7 @@ void Host::setState(e_surf_resource_state_t state){
   p_cpu->setState(state);
 }
 
+
 simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
 {
   simgrid::surf::Storage *st = NULL;
@@ -351,7 +369,7 @@ xbt_dynar_t Host::getVms()
        iter !=  simgrid::surf::VMModel::ws_vms.end(); ++iter) {
 
     simgrid::surf::VirtualMachine *ws_vm = &*iter;
-    if (this == ws_vm->p_subWs)
+    if (this == ws_vm->p_hostPM->extension(simgrid::surf::Host::EXTENSION_ID))
       xbt_dynar_push(dyn, &ws_vm);
   }
 
@@ -369,16 +387,5 @@ void Host::setParams(vm_params_t params)
   p_params = *params;
 }
 
-/**********
- * Action *
- **********/
-simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> HostAction::onStateChange;
-
-void HostAction::setState(e_surf_action_state_t state){
-  e_surf_action_state_t old = getState();
-  Action::setState(state);
-  onStateChange(this, old, state);
-}
-
 }
 }