snake_case VivaldiZone

diff --git a/include/simgrid/kernel/routing/VivaldiZone.hpp b/include/simgrid/kernel/routing/VivaldiZone.hpp
index a5e1bc6..d1bc241 100644 (file)
--- a/include/simgrid/kernel/routing/VivaldiZone.hpp
+++ b/include/simgrid/kernel/routing/VivaldiZone.hpp
@@ -48,8 +48,16 @@ class XBT_PRIVATE VivaldiZone : public ClusterZone {
 public:
   explicit VivaldiZone(NetZone* father, std::string name);
 
 public:
   explicit VivaldiZone(NetZone* father, std::string name);
 

-  void setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, std::string coord);
+  void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, std::string coord);

   void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;
   void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;

+
+  // deprecated
+  XBT_ATTRIB_DEPRECATED_v323("Please use VivaldiZone::set_peer_link()") void setPeerLink(NetPoint* netpoint,
+                                                                                         double bw_in, double bw_out,
+                                                                                         std::string coord)
+  {
+    set_peer_link(netpoint, bw_in, bw_out, coord);
+  }

 };
 
 namespace vivaldi {
 };
 
 namespace vivaldi {

diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp
index 4c70072..8bc5201 100644 (file)
--- a/src/kernel/routing/VivaldiZone.cpp
+++ b/src/kernel/routing/VivaldiZone.cpp
@@ -51,7 +51,7 @@ static inline double euclidean_dist_comp(int index, std::vector<double>* src, st
   return (src_coord - dst_coord) * (src_coord - dst_coord);
 }
 
   return (src_coord - dst_coord) * (src_coord - dst_coord);
 }
 

-static std::vector<double>* getCoordsFromNetpoint(NetPoint* np)
+static std::vector<double>* netpoint_get_coords(NetPoint* np)

 {
   simgrid::kernel::routing::vivaldi::Coords* coords = np->extension<simgrid::kernel::routing::vivaldi::Coords>();
   xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)",
 {
   simgrid::kernel::routing::vivaldi::Coords* coords = np->extension<simgrid::kernel::routing::vivaldi::Coords>();
   xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)",


@@ -63,7 +63,7 @@ VivaldiZone::VivaldiZone(NetZone* father, std::string name) : ClusterZone(father
 {
 }
 
 {
 }
 

-void VivaldiZone::setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, std::string coord)
+void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, std::string coord)

 {
   xbt_assert(netpoint->get_englobing_zone() == this,
              "Cannot add a peer link to a netpoint that is not in this netzone");
 {
   xbt_assert(netpoint->get_englobing_zone() == this,
              "Cannot add a peer link to a netpoint that is not in this netzone");


@@ -115,8 +115,8 @@ void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArg
 
   /* Compute the extra latency due to the euclidean distance if needed */
   if (lat) {
 
   /* Compute the extra latency due to the euclidean distance if needed */
   if (lat) {

-    std::vector<double>* srcCoords = getCoordsFromNetpoint(src);
-    std::vector<double>* dstCoords = getCoordsFromNetpoint(dst);
+    std::vector<double>* srcCoords = netpoint_get_coords(src);
+    std::vector<double>* dstCoords = netpoint_get_coords(dst);

 
     double euclidean_dist =
         sqrt(euclidean_dist_comp(0, srcCoords, dstCoords) + euclidean_dist_comp(1, srcCoords, dstCoords)) +
 
     double euclidean_dist =
         sqrt(euclidean_dist_comp(0, srcCoords, dstCoords) + euclidean_dist_comp(1, srcCoords, dstCoords)) +

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 5df6412..f2a5971 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -484,7 +484,7 @@ void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer)
   speedPerPstate.push_back(peer->speed);
   simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr);
 
   speedPerPstate.push_back(peer->speed);
   simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr);
 

-  as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord);
+  as->set_peer_link(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord);

 
   /* Change from the defaults */
   if (peer->state_trace)
 
   /* Change from the defaults */
   if (peer->state_trace)