Update

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

diff --git a/ChangeLog b/ChangeLog
index f4a2be6..112626e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
 SimGrid (2.92) NOT RELEASED YET; urgency=low
 
   Alpha 3 on the path to SimGrid 3
 SimGrid (2.92) NOT RELEASED YET; urgency=low
 
   Alpha 3 on the path to SimGrid 3

+  [Arnaud]
+  (gras)
+   - New! First try of benchmarking macros.
+   - New! First try so that gras_stub_generator generate deployment and
+     remote compilation helpers.
+  (msg)
+   - Bugfix: Initialization fix in msg_test.

 
   [Martin]
 
   [Martin]

+  (surf)
+   - Bugfix: applied patch to lexer so that it doesn't need a huge heap.

   (xbt)
    - Bugfix: let dicts work with NULL content (_foreach didn't) and cleanups
   (gras)
   (xbt)
    - Bugfix: let dicts work with NULL content (_foreach didn't) and cleanups
   (gras)

diff --git a/examples/gras/chrono/chrono.c b/examples/gras/chrono/chrono.c
index eb31f9a..48a77a1 100644 (file)
--- a/examples/gras/chrono/chrono.c
+++ b/examples/gras/chrono/chrono.c
@@ -20,8 +20,9 @@ int multiplier (int argc,char *argv[])
 {
   int i,j,k,l;
   double *A,*B,*C;
 {
   int i,j,k,l;
   double *A,*B,*C;

-  int n = 500;
+  int n = 100;

   double start = 0.0;
   double start = 0.0;

+  double now = 0.0;

 
   gras_init(&argc, argv, NULL);
 
 
   gras_init(&argc, argv, NULL);
 


@@ -29,9 +30,12 @@ int multiplier (int argc,char *argv[])
   B = malloc(n*n*sizeof(double));
   C = malloc(n*n*sizeof(double));
 
   B = malloc(n*n*sizeof(double));
   C = malloc(n*n*sizeof(double));
 

-  INFO1("Before computation: %lg", start=gras_os_time());
+  start=now=gras_os_time();
+
+  INFO1("Before computation: %lg", start);

 
   for(l=0; l<4; l++) {
 
   for(l=0; l<4; l++) {

+    now=gras_os_time();

     GRAS_BENCH_ONCE_RUN_ONCE_BEGIN();
     for(i=0; i<n; i++)
       for(j=0; j<n; j++) {
     GRAS_BENCH_ONCE_RUN_ONCE_BEGIN();
     for(i=0; i<n; i++)
       for(j=0; j<n; j++) {


@@ -46,10 +50,12 @@ int multiplier (int argc,char *argv[])
          C[i*n+j] += A[i*n+k]*B[k*n+j];
     
     GRAS_BENCH_ONCE_RUN_ONCE_END();
          C[i*n+j] += A[i*n+k]*B[k*n+j];
     
     GRAS_BENCH_ONCE_RUN_ONCE_END();

+    now=gras_os_time()-now;
+    INFO2("Iteration %d : %lg ", l, now);

   }
 
   }
 

-  start = gras_os_time()-start;
-  INFO2("After computation: %lg; Duration: %lg ", gras_os_time(), start);
+  now=gras_os_time()-start;
+  INFO2("After computation: %lg; Duration: %lg ", gras_os_time(), now);

 
   return 0;
 }
 
   return 0;
 }