snake_case Engine signals

diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp
index c2ac4b0..bd28d99 100644 (file)
--- a/include/simgrid/s4u/Engine.hpp
+++ b/include/simgrid/s4u/Engine.hpp
@@ -227,13 +227,13 @@ extern XBT_PUBLIC xbt::signal<void()> on_platform_created;
 extern XBT_PUBLIC xbt::signal<void()> on_platform_creation;
 
 /** Callback fired when the main simulation loop ends, just before the end of Engine::run() */
 extern XBT_PUBLIC xbt::signal<void()> on_platform_creation;
 
 /** Callback fired when the main simulation loop ends, just before the end of Engine::run() */

-extern XBT_PUBLIC xbt::signal<void()> onSimulationEnd;
+extern XBT_PUBLIC xbt::signal<void()> on_simulation_end;

 
 /** Callback fired when the time jumps into the future */
 
 /** Callback fired when the time jumps into the future */

-extern XBT_PUBLIC xbt::signal<void(double)> onTimeAdvance;
+extern XBT_PUBLIC xbt::signal<void(double)> on_time_advance;

 
 /** Callback fired when the time cannot jump because of inter-actors deadlock */
 
 /** Callback fired when the time cannot jump because of inter-actors deadlock */

-extern XBT_PUBLIC xbt::signal<void(void)> onDeadlock;
+extern XBT_PUBLIC xbt::signal<void(void)> on_deadlock;

 
 template <class T> XBT_PRIVATE void netzoneByTypeRecursive(s4u::NetZone* current, std::vector<T*>* whereto)
 {
 
 template <class T> XBT_PRIVATE void netzoneByTypeRecursive(s4u::NetZone* current, std::vector<T*>* whereto)
 {

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 41ac7a6..4a7fd8a 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -281,8 +281,8 @@ void TRACE_global_init()
 
   /* Connect callbacks */
   simgrid::s4u::on_platform_creation.connect(TRACE_start);
 
   /* Connect callbacks */
   simgrid::s4u::on_platform_creation.connect(TRACE_start);

-  simgrid::s4u::onDeadlock.connect(TRACE_end);
-  simgrid::s4u::onSimulationEnd.connect(TRACE_end);
+  simgrid::s4u::on_deadlock.connect(TRACE_end);
+  simgrid::s4u::on_simulation_end.connect(TRACE_end);

 }
 
 static void print_line (const char *option, const char *desc, const char *longdesc, int detailed)
 }
 
 static void print_line (const char *option, const char *desc, const char *longdesc, int detailed)

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index dc11db8..1263f11 100644 (file)
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -25,9 +25,9 @@ namespace simgrid {
 namespace s4u {
 xbt::signal<void()> on_platform_creation;
 xbt::signal<void()> on_platform_created;
 namespace s4u {
 xbt::signal<void()> on_platform_creation;
 xbt::signal<void()> on_platform_created;

-xbt::signal<void()> onSimulationEnd;
-xbt::signal<void(double)> onTimeAdvance;
-xbt::signal<void(void)> onDeadlock;
+xbt::signal<void()> on_simulation_end;
+xbt::signal<void(double)> on_time_advance;
+xbt::signal<void(void)> on_deadlock;

 
 Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
 
 
 Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
 

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 2bcbdb2..11b654e 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -544,10 +544,10 @@ void SIMIX_run()
       XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
     }
     SIMIX_display_process_status();
       XBT_CRITICAL("Oops! Deadlock or code not perfectly clean.");
     }
     SIMIX_display_process_status();

-    simgrid::s4u::onDeadlock();
+    simgrid::s4u::on_deadlock();

     xbt_abort();
   }
     xbt_abort();
   }

-  simgrid::s4u::onSimulationEnd();
+  simgrid::s4u::on_simulation_end();

 }
 
 /**
 }
 
 /**

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index e76aaa0..75c8a9d 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -616,7 +616,7 @@ void SMPI_init(){
   smpi_init_options();
   smpi_global_init();
   smpi_check_options();
   smpi_init_options();
   smpi_global_init();
   smpi_check_options();

-  simgrid::s4u::onSimulationEnd.connect(TRACE_smpi_release);
+  simgrid::s4u::on_simulation_end.connect(TRACE_smpi_release);

 }
 
 void SMPI_finalize(){
 }
 
 void SMPI_finalize(){

diff --git a/src/surf/plugins/host_energy.cpp b/src/surf/plugins/host_energy.cpp
index 9bda609..e8f4fa4 100644 (file)
--- a/src/surf/plugins/host_energy.cpp
+++ b/src/surf/plugins/host_energy.cpp
@@ -461,7 +461,7 @@ void sg_host_energy_plugin_init()
   simgrid::s4u::Host::onStateChange.connect(&onHostChange);
   simgrid::s4u::Host::onSpeedChange.connect(&onHostChange);
   simgrid::s4u::Host::onDestruction.connect(&onHostDestruction);
   simgrid::s4u::Host::onStateChange.connect(&onHostChange);
   simgrid::s4u::Host::onSpeedChange.connect(&onHostChange);
   simgrid::s4u::Host::onDestruction.connect(&onHostDestruction);

-  simgrid::s4u::onSimulationEnd.connect(&onSimulationEnd);
+  simgrid::s4u::on_simulation_end.connect(&onSimulationEnd);

   simgrid::surf::CpuAction::onStateChange.connect(&onActionStateChange);
 }
 
   simgrid::surf::CpuAction::onStateChange.connect(&onActionStateChange);
 }
 

diff --git a/src/surf/plugins/link_energy.cpp b/src/surf/plugins/link_energy.cpp
index e7eb0c6..0640a88 100644 (file)
--- a/src/surf/plugins/link_energy.cpp
+++ b/src/surf/plugins/link_energy.cpp
@@ -214,7 +214,7 @@ void sg_link_energy_plugin_init()
   });
 
   simgrid::s4u::Link::onCommunicate.connect(&onCommunicate);
   });
 
   simgrid::s4u::Link::onCommunicate.connect(&onCommunicate);

-  simgrid::s4u::onSimulationEnd.connect(&onSimulationEnd);
+  simgrid::s4u::on_simulation_end.connect(&onSimulationEnd);

 }
 
 /** @ingroup plugin_energy
 }
 
 /** @ingroup plugin_energy

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 52a057b..32f0c00 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -140,7 +140,7 @@ double surf_solve(double max_date)
   for (auto const& model : *all_existing_models)
     model->update_actions_state(NOW, time_delta);
 
   for (auto const& model : *all_existing_models)
     model->update_actions_state(NOW, time_delta);
 

-  simgrid::s4u::onTimeAdvance(time_delta);
+  simgrid::s4u::on_time_advance(time_delta);

 
   TRACE_paje_dump_buffer(false);
 
 
   TRACE_paje_dump_buffer(false);