Merge branch 'dev-unit_test_cleanup' into 'master'

Dev unit test cleanup

See merge request simgrid/simgrid!98

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 81a0bf7..4217481 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -284,7 +284,7 @@ void EngineImpl::shutdown()
   XBT_DEBUG("EngineImpl::shutdown() called. Simulation's over.");
 #if HAVE_SMPI
   if (not instance_->actor_list_.empty()) {
-    if (smpi_process()->initialized()) {
+    if (smpi_process() && smpi_process()->initialized()) {
       xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
     } else {
       XBT_WARN("Process called exit when leaving - Skipping cleanups");

diff --git a/src/kernel/routing/StarZone.cpp b/src/kernel/routing/StarZone.cpp
index 16b7262..a6ef423 100644 (file)
--- a/src/kernel/routing/StarZone.cpp
+++ b/src/kernel/routing/StarZone.cpp
@@ -62,8 +62,9 @@ void StarZone::get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_n
   xbt_node_t star_node = new_xbt_graph_node(graph, get_cname(), nodes);
 
   for (auto const& src : get_vertices()) {
+    const char* src_name = routes_[src->id()].gateway ? routes_[src->id()].gateway->get_cname() : src->get_cname();
+    xbt_node_t src_node  = new_xbt_graph_node(graph, src_name, nodes);
     /* going up */
-    xbt_node_t src_node = new_xbt_graph_node(graph, src->get_cname(), nodes);
     xbt_node_t previous = src_node;
     for (auto const* link : routes_[src->id()].links_up) {
       xbt_node_t current = new_xbt_graph_node(graph, link->get_cname(), nodes);
@@ -75,10 +76,10 @@ void StarZone::get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_n
     previous = star_node;
     for (auto const* link : routes_[src->id()].links_down) {
       xbt_node_t current = new_xbt_graph_node(graph, link->get_cname(), nodes);
-      new_xbt_graph_edge(graph, current, previous, edges);
+      new_xbt_graph_edge(graph, previous, current, edges);
       previous = current;
     }
-    new_xbt_graph_edge(graph, src_node, previous, edges);
+    new_xbt_graph_edge(graph, previous, src_node, edges);
   }
 }
 

diff --git a/tools/graphicator/graphicator.tesh b/tools/graphicator/graphicator.tesh
index a33759b..928b6ab 100644 (file)
--- a/tools/graphicator/graphicator.tesh
+++ b/tools/graphicator/graphicator.tesh
@@ -27,25 +27,25 @@ $ cat test.dot
 >   "bob_cluster_link_6_DOWN";
 >   "bob_cluster_link_6_UP";
 >   "bobbob_cluster_router.hamburger.edu";
->   "bob_cluster_link_0_DOWN" -- "bob_cluster_backbone";
+>   "bob_cluster_link_0_DOWN" -- "bob0.hamburger.edu";
+>   "bob_cluster_link_2_DOWN" -- "bob2.hamburger.edu";
+>   "bob_cluster_link_3_DOWN" -- "bob3.hamburger.edu";
+>   "bob_cluster_link_4_DOWN" -- "bob4.hamburger.edu";
+>   "bob_cluster_link_6_DOWN" -- "bob6.hamburger.edu";
 >   "bob_cluster_link_0_UP" -- "bob_cluster_backbone";
->   "bob_cluster_link_2_DOWN" -- "bob_cluster_backbone";
 >   "bob_cluster_link_2_UP" -- "bob_cluster_backbone";
->   "bob_cluster_link_3_DOWN" -- "bob_cluster_backbone";
 >   "bob_cluster_link_3_UP" -- "bob_cluster_backbone";
->   "bob_cluster_link_4_DOWN" -- "bob_cluster_backbone";
 >   "bob_cluster_link_4_UP" -- "bob_cluster_backbone";
->   "bob_cluster_link_6_DOWN" -- "bob_cluster_backbone";
 >   "bob_cluster_link_6_UP" -- "bob_cluster_backbone";
->   "bob0.hamburger.edu" -- "bob_cluster_link_0_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_0_DOWN";
 >   "bob0.hamburger.edu" -- "bob_cluster_link_0_UP";
->   "bob2.hamburger.edu" -- "bob_cluster_link_2_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_2_DOWN";
 >   "bob2.hamburger.edu" -- "bob_cluster_link_2_UP";
->   "bob3.hamburger.edu" -- "bob_cluster_link_3_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_3_DOWN";
 >   "bob3.hamburger.edu" -- "bob_cluster_link_3_UP";
->   "bob4.hamburger.edu" -- "bob_cluster_link_4_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_4_DOWN";
 >   "bob4.hamburger.edu" -- "bob_cluster_link_4_UP";
->   "bob6.hamburger.edu" -- "bob_cluster_link_6_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_6_DOWN";
 >   "bob6.hamburger.edu" -- "bob_cluster_link_6_UP";
 >   "bob_cluster_backbone" -- "bob_cluster";
 >   "bobbob_cluster_router.hamburger.edu" -- "bob_cluster";
@@ -58,25 +58,25 @@ $ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/platforms/one_cluster.xml test
 
 $ cat test.csv
 > src,dst
-> bob_cluster_link_0_DOWN,bob_cluster_backbone
+> bob_cluster_link_0_DOWN,bob0.hamburger.edu
+> bob_cluster_link_2_DOWN,bob2.hamburger.edu
+> bob_cluster_link_3_DOWN,bob3.hamburger.edu
+> bob_cluster_link_4_DOWN,bob4.hamburger.edu
+> bob_cluster_link_6_DOWN,bob6.hamburger.edu
 > bob_cluster_link_0_UP,bob_cluster_backbone
-> bob_cluster_link_2_DOWN,bob_cluster_backbone
 > bob_cluster_link_2_UP,bob_cluster_backbone
-> bob_cluster_link_3_DOWN,bob_cluster_backbone
 > bob_cluster_link_3_UP,bob_cluster_backbone
-> bob_cluster_link_4_DOWN,bob_cluster_backbone
 > bob_cluster_link_4_UP,bob_cluster_backbone
-> bob_cluster_link_6_DOWN,bob_cluster_backbone
 > bob_cluster_link_6_UP,bob_cluster_backbone
-> bob0.hamburger.edu,bob_cluster_link_0_DOWN
+> bob_cluster_backbone,bob_cluster_link_0_DOWN
 > bob0.hamburger.edu,bob_cluster_link_0_UP
-> bob2.hamburger.edu,bob_cluster_link_2_DOWN
+> bob_cluster_backbone,bob_cluster_link_2_DOWN
 > bob2.hamburger.edu,bob_cluster_link_2_UP
-> bob3.hamburger.edu,bob_cluster_link_3_DOWN
+> bob_cluster_backbone,bob_cluster_link_3_DOWN
 > bob3.hamburger.edu,bob_cluster_link_3_UP
-> bob4.hamburger.edu,bob_cluster_link_4_DOWN
+> bob_cluster_backbone,bob_cluster_link_4_DOWN
 > bob4.hamburger.edu,bob_cluster_link_4_UP
-> bob6.hamburger.edu,bob_cluster_link_6_DOWN
+> bob_cluster_backbone,bob_cluster_link_6_DOWN
 > bob6.hamburger.edu,bob_cluster_link_6_UP
 > bob_cluster_backbone,bob_cluster
 > bobbob_cluster_router.hamburger.edu,bob_cluster