Now use --cfg=workstation_model:<MODELNAME> to switch to the desired

network analytical model.

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

diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index 4cfefa9..5fa6f67 100644 (file)
--- a/examples/msg/sendrecv/sendrecv.c
+++ b/examples/msg/sendrecv/sendrecv.c
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
   MSG_global_init(&argc,argv);
 
 
-  if (argc != 4){
+  if (argc != 3){
      CRITICAL1 ("Usage: %s platform_file deployment_file <model>\n",argv[0]);
      CRITICAL1 ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n",argv[0]);
      exit(1);
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
      KCCFLN05_Vegas        => for TCP Vegas
      KCCFLN05_Reno         => for TCP Reno
   */
-  MSG_config("workstation_model", argv[3]);
+  //MSG_config("workstation_model", argv[3]);
 
   res = test_all(argv[1],argv[2]);
 

diff --git a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
index d9c27f8..090595b 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
+++ b/examples/msg/sendrecv/sendrecv_KCCFLN05.tesh
@@ -2,7 +2,8 @@
 
 p Testing the surf network maxmin fairness model
 
-$ $SG_TEST_EXENV ${srcdir:=.}/sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml KCCFLN05
+$ $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'
 > [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_Reno.tesh b/examples/msg/sendrecv/sendrecv_KCCFLN05_Reno.tesh
index 9dc2e42..c2a3613 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05_Reno.tesh
+++ b/examples/msg/sendrecv/sendrecv_KCCFLN05_Reno.tesh
@@ -3,7 +3,8 @@
 p Testing the surf network Reno fairness model using lagrangian approach
 
 
-$ $SG_TEST_EXENV ${srcdir:=.}/sendrecv/sendrecv ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml KCCFLN05_Reno
+$ $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'
 > [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_KCCFLN05_Vegas.tesh
index 0385e33..1fb9089 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05_Vegas.tesh
+++ b/examples/msg/sendrecv/sendrecv_KCCFLN05_Vegas.tesh
@@ -2,7 +2,8 @@
 
 p Testing the surf network Vegas fairness model using lagrangian approach
 
-$ $SG_TEST_EXENV ${srcdir:=.}/sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml KCCFLN05_Vegas
+$ $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'
 > [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_proportional.tesh b/examples/msg/sendrecv/sendrecv_KCCFLN05_proportional.tesh
index 57e0562..a93d5ff 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_KCCFLN05_proportional.tesh
+++ b/examples/msg/sendrecv/sendrecv_KCCFLN05_proportional.tesh
@@ -2,7 +2,8 @@
 
 p Testing the surf network proportional fairness model using SDP approach
 
-$ $SG_TEST_EXENV ${srcdir:=.}/sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml KCCFLN05_proportional
+$ $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'
 > [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