display more info during the test

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

diff --git a/examples/gras/mutual_exclusion/simple_token/simple_token.c b/examples/gras/mutual_exclusion/simple_token/simple_token.c
index 7960919..1c3b8be 100644 (file)
--- a/examples/gras/mutual_exclusion/simple_token/simple_token.c
+++ b/examples/gras/mutual_exclusion/simple_token/simple_token.c
@@ -136,9 +136,9 @@ int node(int argc, char *argv[])
   globals->create = 0;
   globals->tosuccessor = NULL;
 
   globals->create = 0;
   globals->tosuccessor = NULL;
 

-  if (!gras_os_getpid() % 100)
-    INFO4("Launch node %d (successor on %s:%d; listening on %d)",
-          gras_os_getpid(), host, peerport, myport);
+  if (!gras_os_getpid() % 100 || gras_if_RL())
+    INFO3("Launch node listening on %d (successor on %s:%d)",
+          myport, host, peerport);

 
   /* 4. Register the known messages.  */
   gras_msgtype_declare("stoken", gras_datadesc_by_name("int"));
 
   /* 4. Register the known messages.  */
   gras_msgtype_declare("stoken", gras_datadesc_by_name("int"));

diff --git a/examples/gras/mutual_exclusion/simple_token/test_rl b/examples/gras/mutual_exclusion/simple_token/test_rl
index 2ce3a1c..86cba97 100755 (executable)
--- a/examples/gras/mutual_exclusion/simple_token/test_rl
+++ b/examples/gras/mutual_exclusion/simple_token/test_rl
@@ -1,4 +1,5 @@
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4000 127.0.0.1 4010 --create-token --log=root.fmt:%m%n $@ 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4000 127.0.0.1 4010 --create-token --log=root.fmt:%m%n $@ 

+> Launch node listening on 4000 (successor on 127.0.0.1:4010)

 > Create the token (with value 0) and send it to 127.0.0.1:4010
 > Begin a new loop. Still to do: 2
 > Begin a new loop. Still to do: 1
 > Create the token (with value 0) and send it to 127.0.0.1:4010
 > Begin a new loop. Still to do: 2
 > Begin a new loop. Still to do: 1


@@ -7,16 +8,21 @@
 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4010 127.0.0.1 4020 --log=root.fmt:%m%n $@ 
 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4010 127.0.0.1 4020 --log=root.fmt:%m%n $@ 

+> Launch node listening on 4010 (successor on 127.0.0.1:4020)

 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4020 127.0.0.1 4030 --log=root.fmt:%m%n $@ 
 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4020 127.0.0.1 4030 --log=root.fmt:%m%n $@ 

+> Launch node listening on 4020 (successor on 127.0.0.1:4030)

 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4030 127.0.0.1 4040 --log=root.fmt:%m%n $@ 
 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4030 127.0.0.1 4040 --log=root.fmt:%m%n $@ 

+> Launch node listening on 4030 (successor on 127.0.0.1:4040)

 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4040 127.0.0.1 4050 --log=root.fmt:%m%n $@ 
 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4040 127.0.0.1 4050 --log=root.fmt:%m%n $@ 

+> Launch node listening on 4040 (successor on 127.0.0.1:4050)

 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4050 127.0.0.1 4000 --log=root.fmt:%m%n $@ 
 > Exiting GRAS
 
 & $SG_TEST_EXENV ./simple_token_node$EXEEXT 4050 127.0.0.1 4000 --log=root.fmt:%m%n $@ 

+> Launch node listening on 4050 (successor on 127.0.0.1:4000)

 > Exiting GRAS
 > Exiting GRAS