From 8d1b272640bfce7f3bbb5f9eb8bb3ebd7ac84c37 Mon Sep 17 00:00:00 2001 From: velho Date: Tue, 17 Jul 2007 13:15:16 +0000 Subject: [PATCH] Now use --cfg=workstation_model: 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 --- examples/msg/sendrecv/sendrecv.c | 4 ++-- examples/msg/sendrecv/sendrecv_KCCFLN05.tesh | 3 ++- examples/msg/sendrecv/sendrecv_KCCFLN05_Reno.tesh | 3 ++- examples/msg/sendrecv/sendrecv_KCCFLN05_Vegas.tesh | 3 ++- examples/msg/sendrecv/sendrecv_KCCFLN05_proportional.tesh | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c index 4cfefa9495..5fa6f67146 100644 --- 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 \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 d9c27f867f..090595b293 100644 --- 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 9dc2e424f1..c2a3613926 100644 --- 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 0385e3365c..1fb908904d 100644 --- 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 57e05620da..a93d5ff0f5 100644 --- 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 -- 2.20.1