rename the VM callbacks for uniformity

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

diff --git a/src/surf/virtual_machine.cpp b/src/surf/virtual_machine.cpp
index 43fa47e..5e333c0 100644 (file)
--- a/src/surf/virtual_machine.cpp
+++ b/src/surf/virtual_machine.cpp
@@ -4,6 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <xbt/signal.hpp>
+
 #include "cpu_cas01.hpp"
 #include "virtual_machine.hpp"
 
@@ -18,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 *
@@ -37,7 +39,8 @@ VirtualMachine::VirtualMachine(HostModel *model, const char *name, simgrid::s4u:
 , hostPM_(hostPM)
 {
   VMModel::ws_vms.push_back(*this);
-  simgrid::s4u::Host::by_name_or_create(name)->extension_set<simgrid::surf::HostImpl>(this);
+  piface = simgrid::s4u::Host::by_name_or_create(name);
+  piface->extension_set<simgrid::surf::HostImpl>(this);
 }
 
 /*
@@ -45,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();
@@ -62,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);
   }
 }