fixing codacy warnings on multi-core VM tests + using a dedicated platform file for...

diff --git a/examples/platforms/cloud-sharing.xml b/examples/platforms/cloud-sharing.xml
new file mode 100644 (file)
index 0000000..26addba
--- /dev/null
+++ b/examples/platforms/cloud-sharing.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4.1">
+       
+       <AS id="AS_acme" routing="Full">
+               <cluster id="acme" prefix="node-" radical="0-99" suffix=".acme.org" speed="1Gf" bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us" core="1" />
+               <cluster id="acme2" prefix="node-" radical="0-99" suffix=".acme2.org" speed="1Gf" bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us" core="2" />
+               <cluster id="acme4" prefix="node-" radical="0-99" suffix=".acme4.org" speed="1Gf" bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us" core="4" />
+       </AS>
+                  
+</platform>

diff --git a/examples/platforms/cluster.xml b/examples/platforms/cluster.xml
index 91a10e1..628427b 100644 (file)
--- a/examples/platforms/cluster.xml
+++ b/examples/platforms/cluster.xml
@@ -11,11 +11,6 @@
         |                                |
     node-0.acme.org                  node-99.acme.org
   -->
-  
-       <AS id="AS_acme" routing="Full">
-               <cluster id="acme" prefix="node-" radical="0-99" suffix=".acme.org" speed="1Gf" bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us" core="1" />
-               <cluster id="acme2" prefix="node-" radical="0-99" suffix=".acme2.org" speed="1Gf" bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us" core="2" />
-               <cluster id="acme4" prefix="node-" radical="0-99" suffix=".acme4.org" speed="1Gf" bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us" core="4" />
-       </AS>
-                  
+  <cluster id="acme" prefix="node-" radical="0-99" suffix=".acme.org" speed="1Gf" bw="125MBps" lat="50us"
+           bb_bw="2.25GBps"  bb_lat="500us"/>
 </platform>

diff --git a/teshsuite/msg/cloud-sharing/cloud-sharing.c b/teshsuite/msg/cloud-sharing/cloud-sharing.c
index e44126a..ee641f2 100644 (file)
--- a/teshsuite/msg/cloud-sharing/cloud-sharing.c
+++ b/teshsuite/msg/cloud-sharing/cloud-sharing.c
@@ -104,7 +104,6 @@ static int master_main(int argc, char* argv[])
   XBT_INFO("# TEST ON TWO-CORE PMs");
   
   pm0 = MSG_host_by_name("node-0.acme2.org");
-  pm1 = MSG_host_by_name("node-1.acme2.org");
   xbt_assert(pm0, "Host node-0.acme2.org does not seem to exist");
   
   XBT_INFO("## Test 4 (started): check computation on 2 cores PMs");
@@ -287,7 +286,6 @@ static int master_main(int argc, char* argv[])
   XBT_INFO("# TEST ON FOUR-CORE PMs AND TWO-CORE VMs");
   
   pm0 = MSG_host_by_name("node-0.acme4.org");
-  pm1 = MSG_host_by_name("node-1.acme4.org");
   xbt_assert(pm0, "Host node-0.acme4.org does not seem to exist");
   
   XBT_INFO("## Test 9 (started): check impact of a single VM");
@@ -429,7 +427,7 @@ int main(int argc, char* argv[])
   MSG_init(&argc, argv);
 
   /* load the platform file */
-  const char* platform = "../../platforms/cluster.xml";
+  const char* platform = "../../../platforms/cloud-sharing.xml";
   if (argc == 2)
     platform = argv[1];
   MSG_create_environment(platform);

diff --git a/teshsuite/msg/cloud-sharing/cloud-sharing.tesh b/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
index c2e6a27..bca8349 100644 (file)
--- a/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
+++ b/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=no_loc ${srcdir:=.}/../../../examples/platforms/cluster.xml
+$ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=no_loc ${srcdir:=.}/../../../examples/platforms/cloud-sharing.xml
 > [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] # TEST ON SINGLE-CORE PMs
 > [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] ## Test 1 (started): check computation on normal PMs
 > [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] ### Put a task on a PM