X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa159d28bf7eb7b7876fbd85ea11a8d74cf489fc..102079f52888bf091ae08562bf7db74aedea494e:/src/kernel/routing/FloydZone.cpp

diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp
index b3aa1105b2..63214ee3a6 100644
--- a/src/kernel/routing/FloydZone.cpp
+++ b/src/kernel/routing/FloydZone.cpp
@@ -14,9 +14,9 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
 
-#define TO_FLOYD_COST(i, j) (costTable_)[(i) + (j)*table_size]
-#define TO_FLOYD_PRED(i, j) (predecessorTable_)[(i) + (j)*table_size]
-#define TO_FLOYD_LINK(i, j) (linkTable_)[(i) + (j)*table_size]
+#define TO_FLOYD_COST(i, j) (cost_table_)[(i) + (j)*table_size]
+#define TO_FLOYD_PRED(i, j) (predecessor_table_)[(i) + (j)*table_size]
+#define TO_FLOYD_LINK(i, j) (link_table_)[(i) + (j)*table_size]
 
 namespace simgrid {
 namespace kernel {
@@ -24,24 +24,24 @@ namespace routing {
 
 FloydZone::FloydZone(NetZone* father, std::string name) : RoutedZone(father, name)
 {
-  predecessorTable_ = nullptr;
-  costTable_        = nullptr;
-  linkTable_        = nullptr;
+  predecessor_table_ = nullptr;
+  cost_table_        = nullptr;
+  link_table_        = nullptr;
 }
 
 FloydZone::~FloydZone()
 {
-  if (linkTable_ == nullptr) // Dealing with a parse error in the file?
+  if (link_table_ == nullptr) // Dealing with a parse error in the file?
     return;
   unsigned int table_size = getTableSize();
   /* Delete link_table */
   for (unsigned int i = 0; i < table_size; i++)
     for (unsigned int j = 0; j < table_size; j++)
       delete TO_FLOYD_LINK(i, j);
-  delete[] linkTable_;
+  delete[] link_table_;
 
-  delete[] predecessorTable_;
-  delete[] costTable_;
+  delete[] predecessor_table_;
+  delete[] cost_table_;
 }
 
 void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
@@ -56,7 +56,7 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* r
   do {
     int pred = TO_FLOYD_PRED(src->id(), cur);
     if (pred == -1)
-      THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname());
+      THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname());
     route_stack.push_back(TO_FLOYD_LINK(pred, cur));
     cur = pred;
   } while (cur != src->id());
@@ -71,7 +71,7 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* r
     RouteCreationArgs* e_route = route_stack.back();
     route_stack.pop_back();
     if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr &&
-        prev_dst_gw->getCname() != e_route->gw_src->getCname()) {
+        prev_dst_gw->get_cname() != e_route->gw_src->get_cname()) {
       getGlobalRoute(prev_dst_gw, e_route->gw_src, route->link_list, lat);
     }
 
@@ -94,11 +94,11 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi
 
   addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical);
 
-  if (not linkTable_) {
+  if (not link_table_) {
     /* Create Cost, Predecessor and Link tables */
-    costTable_        = new double[table_size * table_size];                 /* link cost from host to host */
-    predecessorTable_ = new int[table_size * table_size];                    /* predecessor host numbers */
-    linkTable_        = new RouteCreationArgs*[table_size * table_size];     /* actual link between src and dst */
+    cost_table_        = new double[table_size * table_size];             /* link cost from host to host */
+    predecessor_table_ = new int[table_size * table_size];                /* predecessor host numbers */
+    link_table_        = new RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */
 
     /* Initialize costs and predecessors */
     for (unsigned int i = 0; i < table_size; i++)
@@ -113,11 +113,11 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi
   if (gw_dst) // netzone route (to adapt the error message, if any)
     xbt_assert(nullptr == TO_FLOYD_LINK(src->id(), dst->id()),
                "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).",
-               src->getCname(), gw_src->getCname(), dst->getCname(), gw_dst->getCname());
+               src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname());
   else
     xbt_assert(nullptr == TO_FLOYD_LINK(src->id(), dst->id()),
-               "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->getCname(),
-               dst->getCname());
+               "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->get_cname(),
+               dst->get_cname());
 
   TO_FLOYD_LINK(src->id(), dst->id()) =
       newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
@@ -129,11 +129,11 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi
       xbt_assert(
           nullptr == TO_FLOYD_LINK(dst->id(), src->id()),
           "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.",
-          dst->getCname(), gw_dst->getCname(), src->getCname(), gw_src->getCname());
+          dst->get_cname(), gw_dst->get_cname(), src->get_cname(), gw_src->get_cname());
     else
       xbt_assert(nullptr == TO_FLOYD_LINK(dst->id(), src->id()),
                  "The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
-                 dst->getCname(), src->getCname());
+                 dst->get_cname(), src->get_cname());
 
     if (gw_dst && gw_src) {
       NetPoint* gw_tmp = gw_src;
@@ -142,10 +142,10 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi
     }
 
     if (not gw_src || not gw_dst)
-      XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->getCname(), src->getCname());
+      XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->get_cname(), src->get_cname());
     else
-      XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", dst->getCname(), gw_src->getCname(), src->getCname(),
-                gw_dst->getCname());
+      XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", dst->get_cname(), gw_src->get_cname(),
+                src->get_cname(), gw_dst->get_cname());
 
     TO_FLOYD_LINK(dst->id(), src->id()) =
         newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0);
@@ -160,11 +160,11 @@ void FloydZone::seal()
   /* set the size of table routing */
   unsigned int table_size = getTableSize();
 
-  if (not linkTable_) {
+  if (not link_table_) {
     /* Create Cost, Predecessor and Link tables */
-    costTable_        = new double[table_size * table_size];                 /* link cost from host to host */
-    predecessorTable_ = new int[table_size * table_size];                    /* predecessor host numbers */
-    linkTable_        = new RouteCreationArgs*[table_size * table_size];     /* actual link between src and dst */
+    cost_table_        = new double[table_size * table_size];             /* link cost from host to host */
+    predecessor_table_ = new int[table_size * table_size];                /* predecessor host numbers */
+    link_table_        = new RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */
 
     /* Initialize costs and predecessors */
     for (unsigned int i = 0; i < table_size; i++)