better leaking than segfaulting

[simgrid.git] / src / surf / host_interface.cpp

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 6a67a72..b2a6700 100644 (file)
--- 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;
 }
@@ -84,19 +88,10 @@ void HostModel::adjustWeightOfDummyCpuActions()
  ************/
 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();
-    });
-  }
-}
+simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onStateChange;
 
 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)
@@ -105,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)
@@ -117,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
  *
@@ -140,16 +139,24 @@ void Host::attach(simgrid::Host* host)
   onCreation(this);
 }
 
-e_surf_resource_state_t Host::getState() {
-  return p_cpu->getState();
+bool Host::isOn() {
+  return p_cpu->isOn();
 }
-void Host::setState(e_surf_resource_state_t state){
-  e_surf_resource_state_t old = Resource::getState();
-  Resource::setState(state);
-  onStateChange(this, old, state);
-  p_cpu->setState(state);
+bool Host::isOff() {
+  return p_cpu->isOff();
+}
+void Host::turnOn(){
+  if (isOff()) {
+    p_cpu->turnOn();
+    onStateChange(this);
+  }
+}
+void Host::turnOff(){
+  if (isOn()) {
+    p_cpu->turnOff();
+    onStateChange(this);
+  }
 }
-
 
 simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
 {