snake_case the s4u::NetZone signals

Deprecation wrapper are impossible

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 990624a..fbf51ba 100644 (file)
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -79,9 +79,9 @@ public:
   static simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
                                    kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                                    std::vector<kernel::resource::LinkImpl*>& link_list)>
-      onRouteCreation;
-  static simgrid::xbt::signal<void(NetZone&)> onCreation;
-  static simgrid::xbt::signal<void(NetZone&)> onSeal;
+      on_route_creation;
+  static simgrid::xbt::signal<void(NetZone&)> on_creation;
+  static simgrid::xbt::signal<void(NetZone&)> on_seal;
 
 protected:
   unsigned int getTableSize() { return vertices_.size(); }

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index 59b16dd..6bf58f3 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -351,10 +351,10 @@ void instr_define_callbacks()
     simgrid::s4u::Host::on_speed_change.connect(instr_host_on_speed_change);
     simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
     simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change);
-    simgrid::s4u::NetZone::onSeal.connect([](simgrid::s4u::NetZone& /*netzone*/) { currentContainer.pop_back(); });
+    simgrid::s4u::NetZone::on_seal.connect([](simgrid::s4u::NetZone& /*netzone*/) { currentContainer.pop_back(); });
     simgrid::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation);
   }
-  simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation);
+  simgrid::s4u::NetZone::on_creation.connect(instr_netzone_on_creation);
 
   simgrid::surf::CpuAction::on_state_change.connect(instr_cpu_action_on_state_change);
   simgrid::s4u::Link::on_communication_state_change.connect(instr_link_on_communication_state_change);

diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp
index 249320a..f6585e6 100644 (file)
--- a/src/kernel/routing/RoutedZone.cpp
+++ b/src/kernel/routing/RoutedZone.cpp
@@ -201,7 +201,7 @@ void RoutedZone::addRouteCheckParams(NetPoint* src, NetPoint* dst, NetPoint* gw_
                dstName, gw_dst->get_cname());
   }
 
-  onRouteCreation(symmetrical, src, dst, gw_src, gw_dst, link_list);
+  on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list);
 }
 }
 }

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index 5e1387a..5eb5139 100644 (file)
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -17,9 +17,9 @@ namespace s4u {
 simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
                           kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                           std::vector<kernel::resource::LinkImpl*>& link_list)>
-    NetZone::onRouteCreation;
-simgrid::xbt::signal<void(NetZone&)> NetZone::onCreation;
-simgrid::xbt::signal<void(NetZone&)> NetZone::onSeal;
+    NetZone::on_route_creation;
+simgrid::xbt::signal<void(NetZone&)> NetZone::on_creation;
+simgrid::xbt::signal<void(NetZone&)> NetZone::on_seal;
 
 NetZone::NetZone(NetZone* father, std::string name) : father_(father), name_(name)
 {

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 0312d24..99d34a8 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -166,7 +166,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL)
   simgrid::surf::on_cluster.connect(&clusterCreation_cb);
 
   simgrid::s4u::on_platform_created.connect(&postparse_cb);
-  simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb);
+  simgrid::s4u::NetZone::on_route_creation.connect(&routeCreation_cb);
 }
 
 NetworkNS3Model::~NetworkNS3Model() {

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 416a7a1..2817796 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -610,7 +610,7 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre
 
   /* set the new current component of the tree */
   current_routing = new_zone;
-  simgrid::s4u::NetZone::onCreation(*new_zone); // notify the signal
+  simgrid::s4u::NetZone::on_creation(*new_zone); // notify the signal
 
   return new_zone;
 }
@@ -625,7 +625,7 @@ void sg_platf_new_Zone_seal()
 {
   xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
   current_routing->seal();
-  simgrid::s4u::NetZone::onSeal(*current_routing);
+  simgrid::s4u::NetZone::on_seal(*current_routing);
   current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->get_father());
 }