Revert "remove a C-like pimple"

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

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 38676b8..a4367e1 100644 (file)
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -36,6 +36,13 @@ simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
 /*********
  * 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, 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
@@ -77,34 +84,31 @@ 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;
-
-static void host_destroy(void *h){
-       static_cast<simgrid::surf::Host*>(h)->destroy();
-}
+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>(host_destroy);
-    SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME
+    EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
+       static_cast<simgrid::surf::Host*>(h)->destroy();
+    });
   }
 }
 
 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, Cpu *cpu)
  : Resource(model, name)
  , PropertyHolder(props)
- , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
+ , p_storage(storage), p_cpu(cpu)
 {
   p_params.ramsize = 0;
 }
 
 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, Cpu *cpu)
  : Resource(model, name, constraint)
  , PropertyHolder(props)
- , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
+ , p_storage(storage), p_cpu(cpu)
 {
   p_params.ramsize = 0;
 }
@@ -113,6 +117,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
  *
@@ -130,20 +138,29 @@ void Host::destroy()
 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();
+bool Host::isOn() {
+  return p_cpu->isOn();
+}
+bool Host::isOff() {
+  return p_cpu->isOff();
 }
-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);
+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)
@@ -365,7 +382,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);
   }
 
@@ -383,16 +400,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);
-}
-
 }
 }