snake_case the signals in s4u::Link (no way to make a deprecation warning)

diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp
index df89744..7a9bea2 100644 (file)
--- a/include/simgrid/s4u/Link.hpp
+++ b/include/simgrid/s4u/Link.hpp
@@ -78,22 +78,22 @@ public:
 
   /* The signals */
   /** @brief Callback signal fired when a new Link is created */
-  static simgrid::xbt::signal<void(s4u::Link&)> onCreation;
+  static simgrid::xbt::signal<void(s4u::Link&)> on_creation;
 
   /** @brief Callback signal fired when a Link is destroyed */
-  static simgrid::xbt::signal<void(s4u::Link&)> onDestruction;
+  static simgrid::xbt::signal<void(s4u::Link&)> on_destruction;
 
   /** @brief Callback signal fired when the state of a Link changes (when it is turned on or off) */
-  static simgrid::xbt::signal<void(s4u::Link&)> onStateChange;
+  static simgrid::xbt::signal<void(s4u::Link&)> on_state_change;
 
   /** @brief Callback signal fired when the bandwidth of a Link changes */
   static simgrid::xbt::signal<void(s4u::Link&)> on_bandwidth_change;
 
   /** @brief Callback signal fired when a communication starts */
-  static simgrid::xbt::signal<void(kernel::resource::NetworkAction*, s4u::Host* src, s4u::Host* dst)> onCommunicate;
+  static simgrid::xbt::signal<void(kernel::resource::NetworkAction*, s4u::Host* src, s4u::Host* dst)> on_communicate;
 
   /** @brief Callback signal fired when a communication changes it state (ready/done/cancel) */
-  static simgrid::xbt::signal<void(kernel::resource::NetworkAction*)> onCommunicationStateChange;
+  static simgrid::xbt::signal<void(kernel::resource::NetworkAction*)> on_communication_state_change;
 
   XBT_ATTRIB_DEPRECATED_v321("Use get_cname(): v3.21 will turn this warning into an error.") const char* name();
 };

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index bb7827e..e1b1fa8 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -356,7 +356,7 @@ void instr_define_callbacks()
   if (TRACE_needs_platform()) {
     simgrid::s4u::on_platform_created.connect(instr_on_platform_created);
     simgrid::s4u::Host::onCreation.connect(instr_host_on_creation);
-    simgrid::s4u::Link::onCreation.connect(instr_link_on_creation);
+    simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
   }
   simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation);
   simgrid::s4u::NetZone::onSeal.connect(instr_netzone_on_seal);

diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp
index 91b9175..b6b1a58 100644 (file)
--- a/src/s4u/s4u_Link.cpp
+++ b/src/s4u/s4u_Link.cpp
@@ -17,12 +17,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_link, s4u, "Logging specific to the S4U link
 namespace simgrid {
 namespace s4u {
 
-simgrid::xbt::signal<void(Link&)> Link::onCreation;
-simgrid::xbt::signal<void(Link&)> Link::onDestruction;
-simgrid::xbt::signal<void(Link&)> Link::onStateChange;
+simgrid::xbt::signal<void(Link&)> Link::on_creation;
+simgrid::xbt::signal<void(Link&)> Link::on_destruction;
+simgrid::xbt::signal<void(Link&)> Link::on_state_change;
 simgrid::xbt::signal<void(Link&)> Link::on_bandwidth_change;
-simgrid::xbt::signal<void(kernel::resource::NetworkAction*, Host* src, Host* dst)> Link::onCommunicate;
-simgrid::xbt::signal<void(kernel::resource::NetworkAction*)> Link::onCommunicationStateChange;
+simgrid::xbt::signal<void(kernel::resource::NetworkAction*, Host* src, Host* dst)> Link::on_communicate;
+simgrid::xbt::signal<void(kernel::resource::NetworkAction*)> Link::on_communication_state_change;
 
 Link* Link::by_name(const char* name)
 {

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 34d8881..9e1db06 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -326,7 +326,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
   }
   XBT_OUT();
 
-  simgrid::s4u::Link::onCommunicate(action, src, dst);
+  simgrid::s4u::Link::on_communicate(action, src, dst);
   return action;
 }
 
@@ -346,7 +346,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam
   if (policy == s4u::Link::SharingPolicy::FATPIPE)
     get_constraint()->unshare();
 
-  simgrid::s4u::Link::onCreation(this->piface_);
+  simgrid::s4u::Link::on_creation(this->piface_);
 }
 
 void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 2b7ca29..197285b 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -70,7 +70,7 @@ kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u:
 {
   NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
 
-  simgrid::s4u::Link::onCommunicate(action, src, dst);
+  simgrid::s4u::Link::on_communicate(action, src, dst);
   return action;
 }
 

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 3445c11..4a68c7b 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -90,8 +90,8 @@ void surf_network_model_init_IB()
 
   surf_network_model = new simgrid::kernel::resource::NetworkIBModel();
   all_existing_models->push_back(surf_network_model);
-  simgrid::s4u::Link::onCommunicationStateChange.connect(IB_action_state_changed_callback);
-  simgrid::s4u::Link::onCommunicate.connect(IB_action_init_callback);
+  simgrid::s4u::Link::on_communication_state_change.connect(IB_action_state_changed_callback);
+  simgrid::s4u::Link::on_communicate.connect(IB_action_init_callback);
   simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
   simgrid::config::set_default<double>("network/weight-S", 8775);
 }

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 2ccae96..7fdfce0 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -145,7 +145,7 @@ void LinkImpl::destroy()
 {
   if (not currentlyDestroying_) {
     currentlyDestroying_ = true;
-    s4u::Link::onDestruction(this->piface_);
+    s4u::Link::on_destruction(this->piface_);
     delete this;
   }
 }
@@ -174,14 +174,14 @@ void LinkImpl::turn_on()
 {
   if (is_off()) {
     Resource::turn_on();
-    s4u::Link::onStateChange(this->piface_);
+    s4u::Link::on_state_change(this->piface_);
   }
 }
 void LinkImpl::turn_off()
 {
   if (is_on()) {
     Resource::turn_off();
-    s4u::Link::onStateChange(this->piface_);
+    s4u::Link::on_state_change(this->piface_);
   }
 }
 
@@ -217,7 +217,7 @@ void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
 void NetworkAction::set_state(Action::State state)
 {
   Action::set_state(state);
-  s4u::Link::onCommunicationStateChange(this);
+  s4u::Link::on_communication_state_change(this);
 }
 
 /** @brief returns a list of all Links that this action is using */

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 372e129..6a56dbd 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -272,7 +272,7 @@ LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwid
   bandwidth_.peak = bandwidth;
   latency_.peak   = latency;
 
-  s4u::Link::onCreation(this->piface_);
+  s4u::Link::on_creation(this->piface_);
 }
 
 LinkNS3::~LinkNS3() = default;
@@ -328,7 +328,7 @@ NetworkNS3Action::NetworkNS3Action(kernel::resource::Model* model, double totalB
   port_number++;
   xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
 
-  s4u::Link::onCommunicate(this, src, dst);
+  s4u::Link::on_communicate(this, src, dst);
 }
 
 void NetworkNS3Action::suspend() {

diff --git a/src/surf/plugins/link_energy.cpp b/src/surf/plugins/link_energy.cpp
index 0640a88..32dff12 100644 (file)
--- a/src/surf/plugins/link_energy.cpp
+++ b/src/surf/plugins/link_energy.cpp
@@ -192,28 +192,24 @@ void sg_link_energy_plugin_init()
 
   xbt_assert(sg_host_count() == 0, "Please call sg_link_energy_plugin_init() before initializing the platform.");
 
-  simgrid::s4u::Link::onCreation.connect([](simgrid::s4u::Link& link) {
-    link.extension_set(new LinkEnergy(&link));
-  });
+  simgrid::s4u::Link::on_creation.connect([](simgrid::s4u::Link& link) { link.extension_set(new LinkEnergy(&link)); });
 
-  simgrid::s4u::Link::onStateChange.connect([](simgrid::s4u::Link& link) {
-    link.extension<LinkEnergy>()->update();
-  });
+  simgrid::s4u::Link::on_state_change.connect([](simgrid::s4u::Link& link) { link.extension<LinkEnergy>()->update(); });
 
-  simgrid::s4u::Link::onDestruction.connect([](simgrid::s4u::Link& link) {
+  simgrid::s4u::Link::on_destruction.connect([](simgrid::s4u::Link& link) {
     if (strcmp(link.get_cname(), "__loopback__"))
       XBT_INFO("Energy consumption of link '%s': %f Joules", link.get_cname(),
                link.extension<LinkEnergy>()->getConsumedEnergy());
   });
 
-  simgrid::s4u::Link::onCommunicationStateChange.connect([](simgrid::kernel::resource::NetworkAction* action) {
+  simgrid::s4u::Link::on_communication_state_change.connect([](simgrid::kernel::resource::NetworkAction* action) {
     for (simgrid::kernel::resource::LinkImpl* link : action->links()) {
       if (link != nullptr)
         link->piface_.extension<LinkEnergy>()->update();
     }
   });
 
-  simgrid::s4u::Link::onCommunicate.connect(&onCommunicate);
+  simgrid::s4u::Link::on_communicate.connect(&onCommunicate);
   simgrid::s4u::on_simulation_end.connect(&onSimulationEnd);
 }
 

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index f16a311..804119c 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -254,7 +254,7 @@ LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwid
   if (policy == s4u::Link::SharingPolicy::FATPIPE)
     get_constraint()->unshare();
 
-  s4u::Link::onCreation(this->piface_);
+  s4u::Link::on_creation(this->piface_);
 }
 
 kernel::resource::Action* CpuL07::execution_start(double size)