rename host callbacks

diff --git a/src/surf/callbacks.cpp b/src/surf/callbacks.cpp
index 78705cb..07b63df 100644 (file)
--- a/src/surf/callbacks.cpp
+++ b/src/surf/callbacks.cpp
@@ -12,7 +12,7 @@
 
 void surf_on_host_created(void (*callback)(sg_host_t))
 {
-  simgrid::surf::Host::creationCallbacks.connect([callback](simgrid::surf::Host* host) {
+  simgrid::surf::Host::onCreation.connect([callback](simgrid::surf::Host* host) {
     const char* id = host->getName();
     sg_host_t h = sg_host_by_name(id);
     xbt_assert(h != NULL, "Host not found for name %s", id);

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index e7014c2..3d08ac4 100644 (file)
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -75,9 +75,9 @@ void HostModel::adjustWeightOfDummyCpuActions()
 /************
  * Resource *
  ************/
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::creationCallbacks;
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::destructionCallbacks;
-simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> Host::stateChangeCallbacks;
+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()
 {
@@ -107,7 +107,7 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_
 
 void Host::onDie()
 {
-  destructionCallbacks(this);
+  onDestruction(this);
   Resource::onDie();
 }
 
@@ -122,13 +122,13 @@ void Host::attach(simgrid::Host* host)
     xbt_die("Already attached to host %s", host->id().c_str());
   host->extension_set(this);
   p_host = host;
-  creationCallbacks(this);
+  onCreation(this);
 }
 
 void Host::setState(e_surf_resource_state_t state){
   e_surf_resource_state_t old = Resource::getState();
   Resource::setState(state);
-  stateChangeCallbacks(this, old, state);
+  onStateChange(this, old, state);
   p_cpu->setState(state);
 }
 
@@ -372,12 +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::stateChangeCallbacks;
+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);
-  stateChangeCallbacks(this, old, state);
+  onStateChange(this, old, state);
 }
 
 }

diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp
index fa34643..986bff7 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -78,9 +78,9 @@ public:
   static simgrid::xbt::Extension<simgrid::Host, Host> EXTENSION_ID;
 
   /* callbacks */
-  static simgrid::surf::signal<void(Host*)> creationCallbacks;    /** Called on each newly created object */
-  static simgrid::surf::signal<void(Host*)> destructionCallbacks; /** Called just before destructing an object */
-  static simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> stateChangeCallbacks;
+  static simgrid::surf::signal<void(Host*)> onCreation;    /** Called on each newly created object */
+  static simgrid::surf::signal<void(Host*)> onDestruction; /** Called just before destructing an object */
+  static simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> onStateChange;
 
 public:
   static void init();
@@ -276,7 +276,7 @@ private:
  */
 class HostAction : public Action {
 public:
-       static simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> stateChangeCallbacks;
+       static simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> onStateChange;
 
   /**
    * @brief HostAction constructor

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 9f045db..77488ac 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -27,7 +27,7 @@ void surf_network_model_init_Constant()
 
   routing_model_create(NULL);
 
-  simgrid::surf::Host::creationCallbacks.connect([](simgrid::surf::Host*) {
+  simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host*) {
     host_number_int++;
   });
   sg_platf_link_add_cb(netcste_parse_nolink);

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 86db6aa..bf1390b 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -99,7 +99,7 @@ void surf_network_model_init_IB(void)
   xbt_dynar_push(all_existing_models, &surf_network_model);
   networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
   networkCommunicateCallbacks.connect(IB_action_init_callback);
-  simgrid::surf::Host::creationCallbacks.connect(IB_create_host_callback);
+  simgrid::surf::Host::onCreation.connect(IB_create_host_callback);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
   
 }

diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp
index cbfde2c..d7bf6db 100644 (file)
--- a/src/surf/plugins/energy.cpp
+++ b/src/surf/plugins/energy.cpp
@@ -143,12 +143,12 @@ void sg_energy_plugin_init() {
     simgrid::energy::surf_energy =
       new std::map<simgrid::surf::Host*, simgrid::energy::HostEnergy*>();
     simgrid::surf::VMCreatedCallbacks.connect(energyVMCreatedCallback);
-    simgrid::surf::Host::creationCallbacks.connect(energyHostCreatedCallback);
-    simgrid::surf::Host::destructionCallbacks.connect(energyHostDestructedCallback);
+    simgrid::surf::Host::onCreation.connect(energyHostCreatedCallback);
+    simgrid::surf::Host::onDestruction.connect(energyHostDestructedCallback);
     simgrid::surf::cpuActionStateChangedCallbacks.connect(
       energyCpuActionStateChangedCallback);
     simgrid::surf::surfExitCallbacks.connect(sg_energy_plugin_exit);
-    simgrid::surf::Host::stateChangeCallbacks.connect(
+    simgrid::surf::Host::onStateChange.connect(
       energyStateChangedCallback);
   }
 }