updated test results for metaxml, props, modified test send_recv_KC.. to CLM..

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

diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am
index 989c325..f5d0ea1 100644 (file)
--- a/examples/msg/Makefile.am
+++ b/examples/msg/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST = msg_platform.xml \
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
 
 
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
 
 

-TESTS = sendrecv/sendrecv_KCCFLN05.tesh \
+TESTS = sendrecv/sendrecv_CLM03.tesh \

         sendrecv/sendrecv_Vegas.tesh \
         sendrecv/sendrecv_Reno.tesh \
         suspend/suspend.tesh \
         sendrecv/sendrecv_Vegas.tesh \
         sendrecv/sendrecv_Reno.tesh \
         suspend/suspend.tesh \

diff --git a/examples/msg/Makefile.in b/examples/msg/Makefile.in
index 5d6f1ee..26010d5 100644 (file)
--- a/examples/msg/Makefile.in
+++ b/examples/msg/Makefile.in
@@ -291,7 +291,7 @@ EXTRA_DIST = msg_platform.xml small_platform.xml \
        gtnets/dogbone-d.xml gtnets/dogbone-p.xml \
        properties/deployment_properties.xml $(am__append_3)
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh
        gtnets/dogbone-d.xml gtnets/dogbone-p.xml \
        properties/deployment_properties.xml $(am__append_3)
 TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh

-TESTS = sendrecv/sendrecv_KCCFLN05.tesh \
+TESTS = sendrecv/sendrecv_CLM03.tesh \

         sendrecv/sendrecv_Vegas.tesh \
         sendrecv/sendrecv_Reno.tesh \
         suspend/suspend.tesh \
         sendrecv/sendrecv_Vegas.tesh \
         sendrecv/sendrecv_Reno.tesh \
         suspend/suspend.tesh \

diff --git a/examples/msg/sendrecv/sendrecv_CLM03.tesh b/examples/msg/sendrecv/sendrecv_CLM03.tesh
new file mode 100644 (file)
index 0000000..6823c68
--- /dev/null
+++ b/examples/msg/sendrecv/sendrecv_CLM03.tesh
@@ -0,0 +1,21 @@
+#! ./tesh
+
+p Testing the surf network maxmin fairness model
+
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation_model:CLM03
+> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'CLM03'
+> [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
+> [Inmos:sender:(1) 0.000000] [msg_test/INFO] host = Bellevue
+> [Inmos:sender:(1) 0.000000] [msg_test/INFO] task_la->data = 0.000000e+00
+> [Bellevue:receiver:(2) 0.000000] [msg_test/INFO] receiver
+> [Inmos:sender:(1) 0.100100] [msg_test/INFO] task_bw->data = 1.001000e-01
+> [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.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.tesh b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
index 090595b..6823c68 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
+++ b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
@@ -2,8 +2,8 @@
 
 p Testing the surf network maxmin fairness model
 
 
 p Testing the surf network maxmin fairness model
 

-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation_model:KCCFLN05
-> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'KCCFLN05'
+$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=workstation_model:CLM03
+> [0.000000] [simix_kernel/INFO] setting 'workstation_model' to 'CLM03'

 > [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
 > [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/simdag/metaxml/metaxml_test.tesh b/examples/simdag/metaxml/metaxml_test.tesh
index 901faaf..3c83a4c 100644 (file)
--- a/examples/simdag/metaxml/metaxml_test.tesh
+++ b/examples/simdag/metaxml/metaxml_test.tesh
@@ -3,6 +3,24 @@
 p Simple test of simdag with metaxml tags
 
 $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
 p Simple test of simdag with metaxml tags
 
 $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml

+> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_0_host:
+> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_0_host:
+> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_1_host:
+> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
+> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_1_host:
+> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_0_host:
+> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000

 > [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_0_host:
 > [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
 > [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_0_host:
 > [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000


@@ -10,13 +28,12 @@ $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
 > [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000

-> [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000

 > [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_1_host:
 > [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
 > [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_1_host:
 > [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000

+> [0.000000] [sd_test/INFO] Route between lille_1_host and lille_0_host:
+> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000

 > [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_0_host:
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_0_host:
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000


@@ -24,27 +41,14 @@ $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
 > [0.000000] [sd_test/INFO] Route between lille_1_host and lille_1_host:
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
 > [0.000000] [sd_test/INFO] Route between lille_1_host and lille_1_host:
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000

-> [0.000000] [sd_test/INFO] Route between lille_1_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000

 > [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_1_host:
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_1_host:
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000

-> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
+> [0.000000] [sd_test/INFO] Route between nancy_1_host and lille_0_host:
+> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000

 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000

-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_1_host:

 > [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000

-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_1_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000

 > [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_0_host:
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
 > [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_0_host:
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000


@@ -52,10 +56,6 @@ $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000

-> [0.000000] [sd_test/INFO] Route between nancy_1_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000

 > [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_1_host:
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
 > [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_1_host:
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000

diff --git a/examples/simdag/properties/test_prop.tesh b/examples/simdag/properties/test_prop.tesh
index f14d199..ab2bbab 100755 (executable)
--- a/examples/simdag/properties/test_prop.tesh
+++ b/examples/simdag/properties/test_prop.tesh
@@ -4,8 +4,8 @@ p Simple test of simdag with properties
 
 $ $SG_TEST_EXENV properties/sd_prop ${srcdir:=.}/../platforms/prop.xml
 > [0.000000] [test/INFO] Property list for workstation C1-00
 
 $ $SG_TEST_EXENV properties/sd_prop ${srcdir:=.}/../platforms/prop.xml
 > [0.000000] [test/INFO] Property list for workstation C1-00

-> [0.000000] [test/INFO]       Property: Hdd has value: 120

 > [0.000000] [test/INFO]       Property: NewProp has value: newValue
 > [0.000000] [test/INFO]       Property: NewProp has value: newValue

+> [0.000000] [test/INFO]       Property: Hdd has value: 120

 > [0.000000] [test/INFO]       Property: NoProp is undefined
 > [0.000000] [test/INFO] Property list for workstation C1-01
 > [0.000000] [test/INFO]       Property: mem on host: 4
 > [0.000000] [test/INFO]       Property: NoProp is undefined
 > [0.000000] [test/INFO] Property list for workstation C1-01
 > [0.000000] [test/INFO]       Property: mem on host: 4


@@ -30,3 +30,4 @@ $ $SG_TEST_EXENV properties/sd_prop ${srcdir:=.}/../platforms/prop.xml
 > [6.000400] [test/INFO] Task 'Task B' start time: 3.600200, finish time: 6.000400
 
 
 > [6.000400] [test/INFO] Task 'Task B' start time: 3.600200, finish time: 6.000400
 
 

+