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 54d562f..3d08ac4 100644 (file)
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -31,12 +31,7 @@ void host_add_traces(){
 namespace simgrid {
 namespace surf {
 
-simgrid::xbt::FacetLevel<simgrid::Host, Host> Host::LEVEL;
-
-simgrid::surf::signal<void(simgrid::surf::Host*)> hostCreatedCallbacks;
-simgrid::surf::signal<void(simgrid::surf::Host*)> hostDestructedCallbacks;
-simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> hostStateChangedCallbacks;
-simgrid::surf::signal<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 *
@@ -80,12 +75,15 @@ 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 (!LEVEL.valid()) {
-    LEVEL = simgrid::Host::add_level<simgrid::surf::Host>();
-    SURF_HOST_LEVEL = LEVEL.id();
+  if (!EXTENSION_ID.valid()) {
+    EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>();
+    SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME
   }
 }
 
@@ -101,7 +99,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)
  : Resource(model, name, constraint)
-, PropertyHolder(props)
+ , PropertyHolder(props)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
 {
   p_params.ramsize = 0;
@@ -109,7 +107,7 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_
 
 void Host::onDie()
 {
-  hostDestructedCallbacks(this);
+  onDestruction(this);
   Resource::onDie();
 }
 
@@ -122,15 +120,15 @@ void Host::attach(simgrid::Host* host)
 {
   if (p_host != nullptr)
     xbt_die("Already attached to host %s", host->id().c_str());
-  host->set_facet(this);
+  host->extension_set(this);
   p_host = host;
-  hostCreatedCallbacks(this);
+  onCreation(this);
 }
 
 void Host::setState(e_surf_resource_state_t state){
   e_surf_resource_state_t old = Resource::getState();
   Resource::setState(state);
-  hostStateChangedCallbacks(this, old, state);
+  onStateChange(this, old, state);
   p_cpu->setState(state);
 }
 
@@ -374,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);
-  hostActionStateChangedCallbacks(this, old, state);
+  onStateChange(this, old, state);
 }
 
 }