Merge remote-tracking branch 'upstream/master' into issue95

[simgrid.git] / teshsuite / s4u / basic-parsing-test / basic-parsing-test.cpp

diff --git a/teshsuite/s4u/basic-parsing-test/basic-parsing-test.cpp b/teshsuite/s4u/basic-parsing-test/basic-parsing-test.cpp
index e195f7b..cba0d49 100644 (file)
--- a/teshsuite/s4u/basic-parsing-test/basic-parsing-test.cpp
+++ b/teshsuite/s4u/basic-parsing-test/basic-parsing-test.cpp
@@ -11,7 +11,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(basic_parsing_test, "[usage] basic-parsing-test <pl
 
 namespace sg4 = simgrid::s4u;
 
-static void test_one_link(const std::vector<sg4::Host*> hosts)
+static void test_one_link(const std::vector<sg4::Host*>& hosts)
 {
   const sg4::Host* h1 = hosts[0];
   const sg4::Host* h2 = hosts[1];
@@ -32,7 +32,7 @@ static void test_one_link(const std::vector<sg4::Host*> hosts)
   XBT_INFO("Route latency = %f, route bandwidth = %f", latency, min_bandwidth);
 }
 
-static void test_full_link(const std::vector<sg4::Host*> hosts)
+static void test_full_link(const std::vector<sg4::Host*>& hosts)
 {
   size_t list_size = hosts.size();
   for (size_t i = 0; i < list_size; i++) {
@@ -63,16 +63,17 @@ int main(int argc, char** argv)
 
   /* creation of the environment */
   e.load_platform(argv[1]);
+  e.seal_platform();
   XBT_INFO("Workstation number: %zu, link number: %zu", e.get_host_count(), e.get_link_count());
 
   std::vector<sg4::Host*> hosts = e.get_all_hosts();
   if (argc >= 3) {
-    if (!strcmp(argv[2], "ONE_LINK"))
+    if (strcmp(argv[2], "ONE_LINK") == 0)
       test_one_link(hosts);
-    if (!strcmp(argv[2], "FULL_LINK"))
+    if (strcmp(argv[2], "FULL_LINK") == 0)
       test_full_link(hosts);
-    if (!strcmp(argv[2], "PROP"))
-      XBT_INFO("SG_TEST_mem: %s", sg4::Host::by_name("host1")->get_property("SG_TEST_mem"));
+    if (strcmp(argv[2], "PROP") == 0)
+      XBT_INFO("SG_TEST_mem: %s", e.host_by_name("host1")->get_property("SG_TEST_mem"));
   }
 
   return 0;