From 506c643fcdd84b5e30621c26a21ba0da605b74a3 Mon Sep 17 00:00:00 2001 From: velho Date: Mon, 7 Feb 2011 13:41:43 +0000 Subject: [PATCH] Removed unnecessary print on master process, tests now cope with this change. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9587 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/msg/gtnets/gtnets-dogbone-gtnets.tesh | 2 -- examples/msg/gtnets/gtnets-dogbone-lv08.tesh | 5 ----- examples/msg/gtnets/gtnets-fullduplex.tesh | 4 ---- examples/msg/gtnets/gtnets-onelink-gtnets.tesh | 2 -- examples/msg/gtnets/gtnets-onelink-lv08.tesh | 2 -- examples/msg/gtnets/gtnets-waxman.tesh | 2 -- 6 files changed, 17 deletions(-) diff --git a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh index 6f59afb925..5f5c4086e9 100644 --- a/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh +++ b/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh @@ -7,7 +7,5 @@ $ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' > [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000 -> [S1:master:(1) 0.300171] [msg_test/INFO] Send completed (to C1). Transfer time: 0.300171 Agregate bandwidth: 33314.335278 -> [S1:master:(1) 0.300171] [msg_test/INFO] Completed peer: C1 time: 0.300171 > [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 33314.335278 ; message from S1 to C1 with remaining : 0.000000 > [C1:slave:(3) 0.300171] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 33314.335278 ; message from S2 to C2 with remaining : 0.000000 diff --git a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh index aab0e721e6..721fa67c2f 100644 --- a/examples/msg/gtnets/gtnets-dogbone-lv08.tesh +++ b/examples/msg/gtnets/gtnets-dogbone-lv08.tesh @@ -6,11 +6,6 @@ $ gtnets/gtnets ${srcdir:=.}/gtnets/dogbone-p.xml ${srcdir:=.}/gtnets/dogbone-d. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08' -> [S1:master:(1) 0.342000] [msg_test/INFO] Send completed (to C1). Transfer time: 0.342000 Agregate bandwidth: 29239.766082 -> [S1:master:(1) 0.342000] [msg_test/INFO] Completed peer: C1 time: 0.342000 -> [S2:master:(2) 0.342000] [msg_test/INFO] Send completed (to C2). Transfer time: 0.342000 Agregate bandwidth: 29239.766082 -> [S2:master:(2) 0.342000] [msg_test/INFO] Completed peer: C2 time: 0.342000 > [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[0] is limited by latency!! > [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[0] : 29239.766082 ; message from S1 to C1 with remaining : 0.000000 -> [C1:slave:(3) 0.342000] [msg_test/INFO] WARNING FLOW[1] is limited by latency!! > [C1:slave:(3) 0.342000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 29239.766082 ; message from S2 to C2 with remaining : 0.000000 diff --git a/examples/msg/gtnets/gtnets-fullduplex.tesh b/examples/msg/gtnets/gtnets-fullduplex.tesh index b1fcf162ec..133d841513 100644 --- a/examples/msg/gtnets/gtnets-fullduplex.tesh +++ b/examples/msg/gtnets/gtnets-fullduplex.tesh @@ -4,8 +4,6 @@ p Testing fullduplex TCP option DISABLED $ gtnets/gtnets ${srcdir:=.}/gtnets/fullduplex-p.xml ${srcdir:=.}/gtnets/fullduplex-d.xml --cfg=fullduplex:0 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'fullduplex' to '0' -> [C1:master:(7) 108.799652] [msg_test/INFO] Send completed (to S1). Transfer time: 108.799652 Agregate bandwidth: 9191.205854 -> [C1:master:(7) 108.799652] [msg_test/INFO] Completed peer: S1 time: 108.799652 > [S1:slave:(8) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 3063.735285 ; message from S1 to C1 with remaining : 666666.666667 > [S1:slave:(8) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[2] : 3063.735285 ; message from S1 to C1 with remaining : 666666.666667 > [S1:slave:(8) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 3063.735285 ; message from S1 to C1 with remaining : 666666.666667 @@ -16,8 +14,6 @@ p Testing fullduplex TCP option ENABLED $ gtnets/gtnets ${srcdir:=.}/gtnets/fullduplex-p.xml ${srcdir:=.}/gtnets/fullduplex-d.xml --cfg=fullduplex:1 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'fullduplex' to '1' -> [S1:master:(1) 331.625739] [msg_test/INFO] Send completed (to C1). Transfer time: 331.625739 Agregate bandwidth: 3015.447482 -> [S1:master:(1) 331.625739] [msg_test/INFO] Completed peer: C1 time: 331.625739 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 3015.447482 ; message from S1 to C1 with remaining : 0.000000 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[2] : 3015.447482 ; message from S1 to C1 with remaining : 0.000000 > [C1:slave:(2) 331.625739] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 3015.447482 ; message from S1 to C1 with remaining : 0.000000 diff --git a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh index 7515b81762..be20fee119 100644 --- a/examples/msg/gtnets/gtnets-onelink-gtnets.tesh +++ b/examples/msg/gtnets/gtnets-onelink-gtnets.tesh @@ -7,7 +7,5 @@ $ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' > [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000 -> [S1:master:(1) 106.291000] [msg_test/INFO] Send completed (to C1). Transfer time: 106.291000 Agregate bandwidth: 9408.134273 -> [S1:master:(1) 106.291000] [msg_test/INFO] Completed peer: C1 time: 106.291000 > [C1:slave:(2) 106.291000] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9408.134273 ; message from S1 to C1 with remaining : 0.000000 diff --git a/examples/msg/gtnets/gtnets-onelink-lv08.tesh b/examples/msg/gtnets/gtnets-onelink-lv08.tesh index 205c2e4a6f..9c73c7f402 100644 --- a/examples/msg/gtnets/gtnets-onelink-lv08.tesh +++ b/examples/msg/gtnets/gtnets-onelink-lv08.tesh @@ -6,6 +6,4 @@ $ gtnets/gtnets ${srcdir:=.}/gtnets/onelink-p.xml ${srcdir:=.}/gtnets/onelink-d. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'LV08' -> [S1:master:(1) 108.799652] [msg_test/INFO] Send completed (to C1). Transfer time: 108.799652 Agregate bandwidth: 9191.205854 -> [S1:master:(1) 108.799652] [msg_test/INFO] Completed peer: C1 time: 108.799652 > [C1:slave:(2) 108.799652] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 9191.205854 ; message from S1 to C1 with remaining : 0.000000 diff --git a/examples/msg/gtnets/gtnets-waxman.tesh b/examples/msg/gtnets/gtnets-waxman.tesh index 531bfb1df4..6c8182fb1d 100644 --- a/examples/msg/gtnets/gtnets-waxman.tesh +++ b/examples/msg/gtnets/gtnets-waxman.tesh @@ -8,8 +8,6 @@ $ gtnets/gtnets ${srcdir:=.}/gtnets/waxman-p.xml ${srcdir:=.}/gtnets/waxman-d.xm > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'GTNets' > [0.000000] [surf_network_gtnets_interface/INFO] TCP window maximum size : 20000 -> [Gavrel:master:(245) 0.016724] [msg_test/INFO] Send completed (to Lafontaine). Transfer time: 0.016724 Agregate bandwidth: 5979535.896806 -> [Gavrel:master:(245) 0.016724] [msg_test/INFO] Completed peer: Lafontaine time: 0.016724 > [Lafontaine:slave:(246) 0.016724] [msg_test/INFO] ===> Estimated Bw of FLOW[1] : 59795.358968 ; message from Ouellet to Amadeus with remaining : 99000.000000 > [Lafontaine:slave:(246) 0.016724] [msg_test/INFO] ===> Estimated Bw of FLOW[2] : 5979535.896806 ; message from Plante to Lecavalier with remaining : 0.000000 > [Lafontaine:slave:(246) 0.016724] [msg_test/INFO] ===> Estimated Bw of FLOW[3] : 5979535.896806 ; message from Renato to Marseille with remaining : 0.000000 -- 2.20.1