rename host callbacks

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

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 737583b..3d08ac4 100644 (file)
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -6,6 +6,8 @@
 
 #include "host_interface.hpp"
 
+#include <simgrid/Host.hpp>
+
 #include "src/simix/smx_private.h"
 #include "cpu_cas01.hpp"
 #include "simgrid/sg_config.h"
@@ -28,11 +30,8 @@ void host_add_traces(){
 
 namespace simgrid {
 namespace surf {
-  
-surf_callback(void, simgrid::surf::Host*) hostCreatedCallbacks;
-surf_callback(void, simgrid::surf::Host*) hostDestructedCallbacks;
-surf_callback(void, simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t) hostStateChangedCallbacks;
-surf_callback(void, simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t) hostActionStateChangedCallbacks;
+
+simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
 
 /*********
  * Model *
@@ -76,9 +75,22 @@ 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*, 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)
- : Resource(model, name, props)
+ : Resource(model, name)
+ , PropertyHolder(props)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
 {
   p_params.ramsize = 0;
@@ -86,28 +98,40 @@ 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)
- : Resource(model, name, props, constraint)
+ : Resource(model, name, constraint)
+ , PropertyHolder(props)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
 {
   p_params.ramsize = 0;
 }
 
-Host::~Host(){
-  surf_callback_emit(hostDestructedCallbacks, this);
+void Host::onDie()
+{
+  onDestruction(this);
+  Resource::onDie();
+}
+
+Host::~Host()
+{
+  this->die();
+}
+
+void Host::attach(simgrid::Host* host)
+{
+  if (p_host != nullptr)
+    xbt_die("Already attached to host %s", host->id().c_str());
+  host->extension_set(this);
+  p_host = host;
+  onCreation(this);
 }
 
 void Host::setState(e_surf_resource_state_t state){
   e_surf_resource_state_t old = Resource::getState();
   Resource::setState(state);
-  surf_callback_emit(hostStateChangedCallbacks, this, old, state);
+  onStateChange(this, old, state);
   p_cpu->setState(state);
 }
 
-xbt_dict_t Host::getProperties()
-{
-  return p_cpu->getProperties();
-}
-
 simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
 {
   simgrid::surf::Storage *st = NULL;
@@ -348,11 +372,12 @@ void Host::setParams(vm_params_t 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);
-  surf_callback_emit(hostActionStateChangedCallbacks, this, old, state);
+  onStateChange(this, old, state);
 }
 
 }