[trace] faster method to dump when unconditional dump to trace file is possible

details:
- if force == 1, no checks: dump and free all events
- specially useful for big platform files (such as g5k)

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

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index f9ffce0..67c7d50 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -71,7 +71,7 @@ int TRACE_end()
 
   /* dump trace buffer */
   TRACE_last_timestamp_to_dump = surf_get_clock();
-  TRACE_paje_dump_buffer();
+  TRACE_paje_dump_buffer(1);
 
   /* destroy all data structures of tracing (and free) */
   destroyAllContainers();

diff --git a/src/instr/instr_paje.c b/src/instr/instr_paje.c
index 678d1d0..33ea5c8 100644 (file)
--- a/src/instr/instr_paje.c
+++ b/src/instr/instr_paje.c
@@ -272,7 +272,7 @@ void destroyContainer (container_t container)
   //obligation to dump previous events because they might
   //reference the container that is about to be destroyed
   TRACE_last_timestamp_to_dump = surf_get_clock();
-  TRACE_paje_dump_buffer();
+  TRACE_paje_dump_buffer(0);
 
   //free
   xbt_free (container->name);

diff --git a/src/instr/instr_paje_trace.c b/src/instr/instr_paje_trace.c
index e4a6fa4..4841f79 100644 (file)
--- a/src/instr/instr_paje_trace.c
+++ b/src/instr/instr_paje_trace.c
@@ -168,18 +168,29 @@ void TRACE_paje_end(void)
 
 double TRACE_last_timestamp_to_dump = 0;
 //dumps the trace file until the timestamp TRACE_last_timestamp_to_dump
-void TRACE_paje_dump_buffer (void)
+void TRACE_paje_dump_buffer (int force)
 {
   DEBUG2("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump);
-  paje_event_t event;
-  while (xbt_dynar_length (buffer) > 0){
-    double head_timestamp = (*(paje_event_t*)xbt_dynar_get_ptr(buffer, 0))->timestamp;
-    if (head_timestamp > TRACE_last_timestamp_to_dump){
-      break;
+  if (force){
+    paje_event_t event;
+    unsigned int i;
+    xbt_dynar_foreach(buffer, i, event){
+      event->print (event);
+      event->free (event);
+    }
+    xbt_dynar_free (&buffer);
+    buffer = xbt_dynar_new (sizeof(paje_event_t), NULL);
+  }else{
+    paje_event_t event;
+    while (xbt_dynar_length (buffer) > 0){
+      double head_timestamp = (*(paje_event_t*)xbt_dynar_get_ptr(buffer, 0))->timestamp;
+      if (head_timestamp > TRACE_last_timestamp_to_dump){
+        break;
+      }
+      xbt_dynar_remove_at (buffer, 0, &event);
+      event->print (event);
+      event->free (event);
     }
-    xbt_dynar_remove_at (buffer, 0, &event);
-    event->print (event);
-    event->free (event);
   }
   DEBUG1("%s: ends", __FUNCTION__);
 }

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index cb8e1f0..ff33c7d 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -64,7 +64,7 @@ extern double TRACE_last_timestamp_to_dump;
 void TRACE_paje_create_header(void);
 void TRACE_paje_start(void);
 void TRACE_paje_end(void);
-void TRACE_paje_dump_buffer (void);
+void TRACE_paje_dump_buffer (int force);
 void new_pajeDefineContainerType(type_t type);
 void new_pajeDefineVariableType(type_t type);
 void new_pajeDefineStateType(type_t type);

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 8113389..dcd5af5 100644 (file)
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -267,6 +267,7 @@ static void instr_routing_parse_end_platform ()
   currentContainer = NULL;
   recursiveGraphExtraction (getRootContainer());
   platform_created = 1;
+  TRACE_paje_dump_buffer(1);
 }
 
 void instr_routing_define_callbacks ()

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 283fa6f..26bfeea 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -467,7 +467,7 @@ double surf_solve(double max_date)
       model->model_private->update_actions_state(NOW, min);
 
 #ifdef HAVE_TRACING
-  TRACE_paje_dump_buffer ();
+  TRACE_paje_dump_buffer (0);
 #endif
 
   return min;