Clean up the mess after the new surf_resource management mechanism

addition.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4050 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index 3a41018..a90bc2f 100644 (file)
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -18,21 +18,21 @@ EXTRA_DIST = msg_platform.xml \
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
 
-TESTS = sendrecv/sendrecv_KCCFLN05.tesh
-if HAVE_SDP
-  TESTS += sendrecv/sendrecv_KCCFLN05_proportional.tesh
-endif
-if HAVE_GTNETS
-endif
-
 
-TESTS+= sendrecv/sendrecv_KCCFLN05_Vegas.tesh \
-        sendrecv/sendrecv_KCCFLN05_Reno.tesh \
+TESTS = sendrecv/sendrecv_KCCFLN05.tesh \
+        sendrecv/sendrecv_Vegas.tesh \
+        sendrecv/sendrecv_Reno.tesh \
         suspend/suspend.tesh \
        masterslave/masterslave.tesh \
        masterslave/masterslave_forwarder.tesh
         #masterslave/masterslave_bypass.tesh
 
+if HAVE_SDP
+  BROKEN_TESTS = sendrecv/sendrecv_SDP.tesh
+endif
+if HAVE_GTNETS
+endif
+
 CLEANFILES = sendrecv/*~ \
              sendrecv/sendrecv \
              suspend/*~ \

diff --git a/examples/msg/sendrecv/sendrecv_KCCFLN05_Reno.tesh b/examples/msg/sendrecv/sendrecv_Reno.tesh
similarity index 60%
rename from examples/msg/sendrecv/sendrecv_KCCFLN05_Reno.tesh
rename to examples/msg/sendrecv/sendrecv_Reno.tesh
index b6814bb..447549f 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05_Reno.tesh
+++ b/examples/msg/sendrecv/sendrecv_Reno.tesh
@@ -3,8 +3,12 @@
 p Testing the surf network Reno fairness model using lagrangian approach
 
 
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation_model:KCCFLN05_Reno
-> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'KCCFLN05_Reno'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical
+> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] type in variable = 2
+> [0.000000] [simix_kernel/INFO] setting 'cpu_model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] type in variable = 2
+> [0.000000] [simix_kernel/INFO] setting 'network_model' to 'Reno'
 > [0.000000] [xbt_cfg/INFO] type in variable = 2
 > [0.000000] [msg_test/INFO] test_all
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender
@@ -15,9 +19,9 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrec
 > [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] Task received : latency task
 > [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] Communic. time 1.001000e-01
 > [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] --- la 0.100100 ----
-> [Bellevue:receiver:(2) 10000.199122] [msg_test/INFO] Task received : bandwidth task
-> [Bellevue:receiver:(2) 10000.199122] [msg_test/INFO] Communic. time 1.000010e+04
-> [Bellevue:receiver:(2) 10000.199122] [msg_test/INFO] --- bw 99999.009793 ----
-> [10000.199122] [msg_test/INFO] Total simulation time: 1.000020e+04
+> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] Task received : bandwidth task
+> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] Communic. time 1.000010e+04
+> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] --- bw 99999.000010 ----
+> [10000.200100] [msg_test/INFO] Total simulation time: 1.000020e+04
 
 

diff --git a/examples/msg/sendrecv/sendrecv_KCCFLN05_proportional.tesh b/examples/msg/sendrecv/sendrecv_SDP.tesh
similarity index 79%
rename from examples/msg/sendrecv/sendrecv_KCCFLN05_proportional.tesh
rename to examples/msg/sendrecv/sendrecv_SDP.tesh
index a93d5ff..1e33d47 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05_proportional.tesh
+++ b/examples/msg/sendrecv/sendrecv_SDP.tesh
@@ -2,8 +2,12 @@
 
 p Testing the surf network proportional fairness model using SDP approach
 
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation_model:KCCFLN05_proportional
-> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'KCCFLN05_proportional'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:SDP"
+> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] type in variable = 2
+> [0.000000] [simix_kernel/INFO] setting 'cpu_model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] type in variable = 2
+> [0.000000] [simix_kernel/INFO] setting 'network_model' to 'SDP'
 > [0.000000] [xbt_cfg/INFO] type in variable = 2
 > [0.000000] [msg_test/INFO] test_all
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender

diff --git a/examples/msg/sendrecv/sendrecv_KCCFLN05_Vegas.tesh b/examples/msg/sendrecv/sendrecv_Vegas.tesh
similarity index 62%
rename from examples/msg/sendrecv/sendrecv_KCCFLN05_Vegas.tesh
rename to examples/msg/sendrecv/sendrecv_Vegas.tesh
index b5f8363..564105a 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05_Vegas.tesh
+++ b/examples/msg/sendrecv/sendrecv_Vegas.tesh
@@ -2,8 +2,12 @@
 
 p Testing the surf network Vegas fairness model using lagrangian approach
 
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation_model:KCCFLN05_Vegas
-> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'KCCFLN05_Vegas'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Vegas"
+> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'compound'
+> [0.000000] [xbt_cfg/INFO] type in variable = 2
+> [0.000000] [simix_kernel/INFO] setting 'cpu_model' to 'Cas01'
+> [0.000000] [xbt_cfg/INFO] type in variable = 2
+> [0.000000] [simix_kernel/INFO] setting 'network_model' to 'Vegas'
 > [0.000000] [xbt_cfg/INFO] type in variable = 2
 > [0.000000] [msg_test/INFO] test_all
 > [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender
@@ -14,9 +18,9 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrec
 > [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] Task received : latency task
 > [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] Communic. time 1.001000e-01
 > [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] --- la 0.100100 ----
-> [Bellevue:receiver:(2) 10000.198827] [msg_test/INFO] Task received : bandwidth task
-> [Bellevue:receiver:(2) 10000.198827] [msg_test/INFO] Communic. time 1.000010e+04
-> [Bellevue:receiver:(2) 10000.198827] [msg_test/INFO] --- bw 99999.012735 ----
-> [10000.198827] [msg_test/INFO] Total simulation time: 1.000020e+04
+> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] Task received : bandwidth task
+> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] Communic. time 1.000010e+04
+> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] --- bw 99999.000010 ----
+> [10000.200100] [msg_test/INFO] Total simulation time: 1.000020e+04