Take arguments as <host>:<port> (=cleanups); reduce default verbosity

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

diff --git a/examples/amok/saturate/medium_deployment.xml b/examples/amok/saturate/medium_deployment.xml
index a1ef8b7..20f506c 100644 (file)
--- a/examples/amok/saturate/medium_deployment.xml
+++ b/examples/amok/saturate/medium_deployment.xml
@@ -2,48 +2,27 @@
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
 <platform_description>
   <process host="Apple" function="maestro">
 <!DOCTYPE platform_description SYSTEM "surfxml.dtd">
 <platform_description>
   <process host="Apple" function="maestro">

-     <argument value="Anne_Marie"/>
-     <argument value="4000"/>
-     <argument value="Audy"/>
-     <argument value="4000"/>
-     <argument value="Verville"/>
-     <argument value="4000"/>
-     <argument value="St_Jean"/>
-     <argument value="4000"/>
-     <argument value="PERL"/>
-     <argument value="4000"/>
-     <argument value="Charron"/>
-     <argument value="4000"/>
-     <argument value="April"/>
-     <argument value="4000"/>
-     <argument value="Jocelyne"/>
-     <argument value="4000"/>
-     <argument value="Gosselin"/>
-     <argument value="4000"/>
-     <argument value="Raymond"/>
-     <argument value="4000"/>
-     <argument value="Owen"/>
-     <argument value="4000"/>
-     <argument value="St_Antoine"/>
-     <argument value="4000"/>
-     <argument value="Gregory"/>
-     <argument value="4000"/>
-     <argument value="SunOS"/>
-     <argument value="4000"/>
-     <argument value="Laurendeau"/>
-     <argument value="4000"/>
-     <argument value="Nelligan"/>
-     <argument value="4000"/>
-     <argument value="Lepage"/>
-     <argument value="4000"/>
-     <argument value="Jacques_Cartier"/>
-     <argument value="4000"/>
-     <argument value="Domey"/>
-     <argument value="4000"/>
-     <argument value="Olivier"/>
-     <argument value="4000"/>
-     <argument value="Jeannine"/>
-     <argument value="4000"/>
+     <argument value="Anne_Marie:4000"/>
+     <argument value="Audy:4000"/>
+     <argument value="Verville:4000"/>
+     <argument value="St_Jean:4000"/>
+     <argument value="PERL:4000"/>
+     <argument value="Charron:4000"/>
+     <argument value="April:4000"/>
+     <argument value="Jocelyne:4000"/>
+     <argument value="Gosselin:4000"/>
+     <argument value="Raymond:4000"/>
+     <argument value="Owen:4000"/>
+     <argument value="St_Antoine:4000"/>
+     <argument value="Gregory:4000"/>
+     <argument value="SunOS:4000"/>
+     <argument value="Laurendeau:4000"/>
+     <argument value="Nelligan:4000"/>
+     <argument value="Lepage:4000"/>
+     <argument value="Jacques_Cartier:4000"/>
+     <argument value="Domey:4000"/>
+     <argument value="Olivier:4000"/>
+     <argument value="Jeannine:4000"/>

   </process>
   <process host="Anne_Marie" function="sensor">
      <argument value="4000"/>
   </process>
   <process host="Anne_Marie" function="sensor">
      <argument value="4000"/>

diff --git a/examples/amok/saturate/saturate.c b/examples/amok/saturate/saturate.c
index e0365cb..37e9524 100644 (file)
--- a/examples/amok/saturate/saturate.c
+++ b/examples/amok/saturate/saturate.c
@@ -279,10 +279,8 @@ static void full_fledged_saturation(int argc, char*argv[]) {
   xbt_host_t h1,h2,h3,h4;
 
   /* Get the sensor location from argc/argv */
   xbt_host_t h1,h2,h3,h4;
 
   /* Get the sensor location from argc/argv */

-  for (i=1; i<argc-1; i+=2){
-    xbt_host_t host=xbt_new(s_xbt_host_t,1);
-    host->name=strdup(argv[i]);
-    host->port=atoi(argv[i+1]);
+  for (i=1; i<argc; i++){
+    xbt_host_t host=xbt_host_from_string(argv[i]);

     INFO2("New sensor: %s:%d",host->name,host->port);
     xbt_dynar_push(hosts,&host);
   }
     INFO2("New sensor: %s:%d",host->name,host->port);
     xbt_dynar_push(hosts,&host);
   }


@@ -324,7 +322,7 @@ static void full_fledged_saturation(int argc, char*argv[]) {
          double ratio;
          if (i==l || j==l || k==l) continue;
 
          double ratio;
          if (i==l || j==l || k==l) continue;
 

-         INFO4("TEST %s %s // %s %s",
+         VERB4("TEST %s %s // %s %s",

                h1->name,h2->name,h3->name,h4->name);
          amok_bw_request(h3->name,h3->port, h4->name,h4->port,
                          buf_size,exp_size,msg_size,
                h1->name,h2->name,h3->name,h4->name);
          amok_bw_request(h3->name,h3->port, h4->name,h4->port,
                          buf_size,exp_size,msg_size,