X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e3b2f1d55a07271c05db2ed5b3fec27561097f9..a8ef121c689a845721188a09f849e171ee5e71f2:/src/plugins/vm/VirtualMachineImpl.cpp

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 2d0b97d79a..6a371cb338 100644
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -40,7 +40,7 @@ std::deque<s4u::VirtualMachine*> VirtualMachineImpl::allVms_;
  */
 const double virt_overhead = 1; // 0.95
 
-static void hostStateChange(s4u::Host& host)
+static void host_state_change(s4u::Host& host)
 {
   if (not host.is_on()) { // just turned off.
     std::vector<s4u::VirtualMachine*> trash;
@@ -53,7 +53,7 @@ static void hostStateChange(s4u::Host& host)
   }
 }
 
-static void addActiveTask(kernel::activity::ActivityImplPtr exec)
+static void add_active_task(kernel::activity::ActivityImplPtr exec)
 {
   s4u::VirtualMachine* vm =
       dynamic_cast<s4u::VirtualMachine*>(boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(exec)->host_);
@@ -64,7 +64,7 @@ static void addActiveTask(kernel::activity::ActivityImplPtr exec)
   }
 }
 
-static void removeActiveTask(kernel::activity::ActivityImplPtr exec)
+static void remove_active_task(kernel::activity::ActivityImplPtr exec)
 {
   s4u::VirtualMachine* vm =
       dynamic_cast<s4u::VirtualMachine*>(boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(exec)->host_);
@@ -78,11 +78,11 @@ static void removeActiveTask(kernel::activity::ActivityImplPtr exec)
 VMModel::VMModel()
 {
   all_existing_models.push_back(this);
-  s4u::Host::on_state_change.connect(hostStateChange);
-  kernel::activity::ExecImpl::on_creation.connect(addActiveTask);
-  kernel::activity::ExecImpl::on_completion.connect(removeActiveTask);
-  kernel::activity::ActivityImpl::on_resumed.connect(addActiveTask);
-  kernel::activity::ActivityImpl::on_suspended.connect(removeActiveTask);
+  s4u::Host::on_state_change.connect(host_state_change);
+  kernel::activity::ExecImpl::on_creation.connect(add_active_task);
+  kernel::activity::ExecImpl::on_completion.connect(remove_active_task);
+  kernel::activity::ActivityImpl::on_resumed.connect(add_active_task);
+  kernel::activity::ActivityImpl::on_suspended.connect(remove_active_task);
 }
 
 double VMModel::next_occuring_event(double now)