rename the VM callbacks for uniformity

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index ce4449a..a107150 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -89,7 +89,7 @@ static std::vector<int> *explodesRadical(const char*radicals){
 
 /** The current AS in the parsing */
 static simgrid::kernel::routing::AsImpl *current_routing = nullptr;
-static simgrid::kernel::routing::AsImpl* routing_get_current()
+static simgrid::kernel::routing::AsImpl *routing_get_current()
 {
   return current_routing;
 }

diff --git a/src/surf/virtual_machine.cpp b/src/surf/virtual_machine.cpp
index ea65bc7..5e333c0 100644 (file)
--- a/src/surf/virtual_machine.cpp
+++ b/src/surf/virtual_machine.cpp
@@ -20,9 +20,9 @@ namespace surf {
  * Callbacks *
  *************/
 
-simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
+simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmCreation;
+simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmDestruction;
+simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmStateChange;
 
 /*********
  * Model *
@@ -48,7 +48,7 @@ VirtualMachine::VirtualMachine(HostModel *model, const char *name, simgrid::s4u:
  */
 VirtualMachine::~VirtualMachine()
 {
-  VMDestructedCallbacks(this);
+  onVmDestruction(this);
   VMModel::ws_vms.erase(VMModel::vm_list_t::s_iterator_to(*this));
   /* Free the cpu_action of the VM. */
   XBT_ATTRIB_UNUSED int ret = action_->unref();
@@ -65,13 +65,13 @@ void VirtualMachine::setState(e_surf_vm_state_t state) {
 void VirtualMachine::turnOn() {
   if (isOff()) {
     Resource::turnOn();
-    VMStateChangedCallbacks(this);
+    onVmStateChange(this);
   }
 }
 void VirtualMachine::turnOff() {
   if (isOn()) {
     Resource::turnOff();
-    VMStateChangedCallbacks(this);
+    onVmStateChange(this);
   }
 }
 

diff --git a/src/surf/virtual_machine.hpp b/src/surf/virtual_machine.hpp
index 2ba1859..d5cc175 100644 (file)
--- a/src/surf/virtual_machine.hpp
+++ b/src/surf/virtual_machine.hpp
@@ -33,17 +33,17 @@ class XBT_PRIVATE VirtualMachine;
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmCreation;
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmDestruction;
 
 /** @ingroup SURF_callbacks
  * @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
  */
-extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> onVmStateChange;
 
 /************
  * Resource *

diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp
index 09cb663..5328921 100644 (file)
--- a/src/surf/vm_hl13.cpp
+++ b/src/surf/vm_hl13.cpp
@@ -31,7 +31,7 @@ void VMHL13Model::updateActionsState(double /*now*/, double /*delta*/) {}
 s4u::Host *VMHL13Model::createVM(const char *name, sg_host_t host_PM)
 {
   VirtualMachine* vm = new VMHL13(this, name, host_PM);
-  VMCreatedCallbacks(vm);
+  onVmCreation(vm);
   return vm->piface;
 }