From 1c080fdf88d3dc8cbf7413b1f8b3ce66d475070a Mon Sep 17 00:00:00 2001 From: mquinson Date: Fri, 8 Jun 2007 14:59:39 +0000 Subject: [PATCH 1/1] Less details in output, less chance to get it wrong when slaves don't come in the exact same order git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3598 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/gras/pmm/Makefile.in | 2 +- examples/gras/pmm/pmm.c | 2 -- examples/gras/pmm/test_rl | 18 ------------------ examples/gras/pmm/test_sg_32 | 18 ------------------ examples/gras/pmm/test_sg_64 | 18 ------------------ 5 files changed, 1 insertion(+), 57 deletions(-) diff --git a/examples/gras/pmm/Makefile.in b/examples/gras/pmm/Makefile.in index 39731ad6d0..cb71972b15 100644 --- a/examples/gras/pmm/Makefile.in +++ b/examples/gras/pmm/Makefile.in @@ -608,7 +608,7 @@ uninstall-am: uninstall-info-am @GRAS_ARCH_32_BITS_TRUE@test-sg: @GRAS_ARCH_32_BITS_TRUE@ $(TESTS_ENVIRONMENT) test_sg_32 @GRAS_ARCH_32_BITS_FALSE@test-sg: -@GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_32 +@GRAS_ARCH_32_BITS_FALSE@ $(TESTS_ENVIRONMENT) test_sg_64 test-rl: $(TESTS_ENVIRONMENT) test_rl diff --git a/examples/gras/pmm/pmm.c b/examples/gras/pmm/pmm.c index 35253ab7b4..969fe8500b 100755 --- a/examples/gras/pmm/pmm.c +++ b/examples/gras/pmm/pmm.c @@ -115,9 +115,7 @@ int master (int argc,char *argv[]) { i++) { xbt_dynar_get_cpy(peers,i,&grid[i]); - INFO2("Connecting to %s:%d.",grid[i]->name,grid[i]->port); socket[i]=gras_socket_client(grid[i]->name,grid[i]->port); - INFO2("Connected to %s:%d.",grid[i]->name,grid[i]->port); } xbt_assert2(i==SLAVE_COUNT, "Not enough slaves for this setting (got %d of %d). Change the deployment file", diff --git a/examples/gras/pmm/test_rl b/examples/gras/pmm/test_rl index 9675167f79..6967772c55 100755 --- a/examples/gras/pmm/test_rl +++ b/examples/gras/pmm/test_rl @@ -40,24 +40,6 @@ & $SG_TEST_EXENV ./pmm_master$EXEEXT 4242 --log=root.fmt:%m%n > Wait for peers for 5 sec > Got 9 pals -> Connecting to 127.0.0.1:3000. -> Connected to 127.0.0.1:3000. -> Connecting to 127.0.0.1:3001. -> Connected to 127.0.0.1:3001. -> Connecting to 127.0.0.1:3002. -> Connected to 127.0.0.1:3002. -> Connecting to 127.0.0.1:3003. -> Connected to 127.0.0.1:3003. -> Connecting to 127.0.0.1:3004. -> Connected to 127.0.0.1:3004. -> Connecting to 127.0.0.1:3005. -> Connected to 127.0.0.1:3005. -> Connecting to 127.0.0.1:3006. -> Connected to 127.0.0.1:3006. -> Connecting to 127.0.0.1:3007. -> Connected to 127.0.0.1:3007. -> Connecting to 127.0.0.1:3008. -> Connected to 127.0.0.1:3008. > XXXXXXXXXXXXXXXXXXXXXX begin Multiplication > The Result of Multiplication is : > >>> Matrix C:res dump (18 x 18) diff --git a/examples/gras/pmm/test_sg_32 b/examples/gras/pmm/test_sg_32 index 8e42c5b0c6..246ecba5b0 100755 --- a/examples/gras/pmm/test_sg_32 +++ b/examples/gras/pmm/test_sg_32 @@ -20,24 +20,6 @@ $ $SG_TEST_EXENV ./pmm_simulator$EXEEXT $srcdir/../../msg/msg_platform.xml $srcd > [St_Jean:slave:(19) 1.000000] [pmm/INFO] Sensor starting (on port 3000) > [Jill:slave:(20) 1.000000] [pmm/INFO] Sensor starting (on port 3000) > [Jacquelin:master:(1) 5.082948] [pmm/INFO] Got 19 pals -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Boivin:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Boivin:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Jean_Yves:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Jean_Yves:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to TeX:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to TeX:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Geoff:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Geoff:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Disney:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Disney:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to iRMX:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to iRMX:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to McGee:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to McGee:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Gatien:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Gatien:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Laroche:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Laroche:3000. > [Jacquelin:master:(1) 5.082948] [pmm/INFO] Too much slaves. Killing Tanguay:3000 > [Jacquelin:master:(1) 5.159107] [pmm/INFO] Too much slaves. Killing Morin:3000 > [Tanguay:slave:(11) 5.159107] [gras/INFO] Exiting GRAS diff --git a/examples/gras/pmm/test_sg_64 b/examples/gras/pmm/test_sg_64 index 8e42c5b0c6..246ecba5b0 100755 --- a/examples/gras/pmm/test_sg_64 +++ b/examples/gras/pmm/test_sg_64 @@ -20,24 +20,6 @@ $ $SG_TEST_EXENV ./pmm_simulator$EXEEXT $srcdir/../../msg/msg_platform.xml $srcd > [St_Jean:slave:(19) 1.000000] [pmm/INFO] Sensor starting (on port 3000) > [Jill:slave:(20) 1.000000] [pmm/INFO] Sensor starting (on port 3000) > [Jacquelin:master:(1) 5.082948] [pmm/INFO] Got 19 pals -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Boivin:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Boivin:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Jean_Yves:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Jean_Yves:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to TeX:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to TeX:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Geoff:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Geoff:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Disney:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Disney:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to iRMX:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to iRMX:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to McGee:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to McGee:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Gatien:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Gatien:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connecting to Laroche:3000. -> [Jacquelin:master:(1) 5.082948] [pmm/INFO] Connected to Laroche:3000. > [Jacquelin:master:(1) 5.082948] [pmm/INFO] Too much slaves. Killing Tanguay:3000 > [Jacquelin:master:(1) 5.159107] [pmm/INFO] Too much slaves. Killing Morin:3000 > [Tanguay:slave:(11) 5.159107] [gras/INFO] Exiting GRAS -- 2.20.1