From 22eeafc5748e8cb949138bd8323750d6e171d6b3 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 30 Apr 2018 16:25:06 +0200 Subject: [PATCH] snake_case Engine signals --- include/simgrid/s4u/Engine.hpp | 6 +++--- src/instr/instr_config.cpp | 4 ++-- src/s4u/s4u_Engine.cpp | 6 +++--- src/simix/smx_global.cpp | 4 ++-- src/smpi/internals/smpi_global.cpp | 2 +- src/surf/plugins/host_energy.cpp | 2 +- src/surf/plugins/link_energy.cpp | 2 +- src/surf/surf_c_bindings.cpp | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index c2ac4b0db0..bd28d99cdd 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -227,13 +227,13 @@ extern XBT_PUBLIC xbt::signal on_platform_created; extern XBT_PUBLIC xbt::signal on_platform_creation; /** Callback fired when the main simulation loop ends, just before the end of Engine::run() */ -extern XBT_PUBLIC xbt::signal onSimulationEnd; +extern XBT_PUBLIC xbt::signal on_simulation_end; /** Callback fired when the time jumps into the future */ -extern XBT_PUBLIC xbt::signal onTimeAdvance; +extern XBT_PUBLIC xbt::signal on_time_advance; /** Callback fired when the time cannot jump because of inter-actors deadlock */ -extern XBT_PUBLIC xbt::signal onDeadlock; +extern XBT_PUBLIC xbt::signal on_deadlock; template XBT_PRIVATE void netzoneByTypeRecursive(s4u::NetZone* current, std::vector* whereto) { diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 41ac7a68c1..4a7fd8ab04 100644 --- 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); - 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) diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index dc11db8c8d..1263f114b0 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -25,9 +25,9 @@ namespace simgrid { namespace s4u { xbt::signal on_platform_creation; xbt::signal on_platform_created; -xbt::signal onSimulationEnd; -xbt::signal onTimeAdvance; -xbt::signal onDeadlock; +xbt::signal on_simulation_end; +xbt::signal on_time_advance; +xbt::signal on_deadlock; 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 2bcbdb2d88..11b654e4d7 100644 --- 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(); - simgrid::s4u::onDeadlock(); + simgrid::s4u::on_deadlock(); 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 e76aaa00b3..75c8a9d894 100644 --- 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(); - simgrid::s4u::onSimulationEnd.connect(TRACE_smpi_release); + simgrid::s4u::on_simulation_end.connect(TRACE_smpi_release); } void SMPI_finalize(){ diff --git a/src/surf/plugins/host_energy.cpp b/src/surf/plugins/host_energy.cpp index 9bda6091d2..e8f4fa4cb1 100644 --- 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::onSimulationEnd.connect(&onSimulationEnd); + simgrid::s4u::on_simulation_end.connect(&onSimulationEnd); simgrid::surf::CpuAction::onStateChange.connect(&onActionStateChange); } diff --git a/src/surf/plugins/link_energy.cpp b/src/surf/plugins/link_energy.cpp index e7eb0c64bb..0640a8817b 100644 --- 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::onSimulationEnd.connect(&onSimulationEnd); + simgrid::s4u::on_simulation_end.connect(&onSimulationEnd); } /** @ingroup plugin_energy diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 52a057b792..32f0c00104 100644 --- 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); - simgrid::s4u::onTimeAdvance(time_delta); + simgrid::s4u::on_time_advance(time_delta); TRACE_paje_dump_buffer(false); -- 2.20.1