[trace] setting the process state to "executing" after migration

[simgrid.git] / src / instr / instr_paje_trace.c

diff --git a/src/instr/instr_paje_trace.c b/src/instr/instr_paje_trace.c
index e4a6fa4..945d3f7 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__);
 }
@@ -310,12 +321,21 @@ static void insert_into_buffer (paje_event_t tbi)
   DEBUG4("%s: insert event_type=%d, timestamp=%f, buffersize=%ld)", __FUNCTION__, tbi->event_type, tbi->timestamp, xbt_dynar_length(buffer));
 
   unsigned int i;
-  if (xbt_dynar_length(buffer) == 0){
+  unsigned long len = xbt_dynar_length(buffer);
+  if (len == 0){
     xbt_dynar_push (buffer, &tbi);
     DEBUG1("%s: inserted at beginning", __FUNCTION__);
   }else{
+    //check if last event has the same timestamp that tbi event
+    paje_event_t e2 = *(paje_event_t*)xbt_dynar_get_ptr (buffer, len-1);
+    if (e2->timestamp == tbi->timestamp){
+      //insert at the end
+      DEBUG2("%s: inserted at end, pos = %ld", __FUNCTION__, len);
+      xbt_dynar_insert_at (buffer, len, &tbi);
+      return;
+    }
     int inserted = 0;
-    for (i = 0; i < xbt_dynar_length(buffer); i++){
+    for (i = 0; i < len; i++){
       paje_event_t e1 = *(paje_event_t*)xbt_dynar_get_ptr(buffer, i);
       if (e1->timestamp > tbi->timestamp){
         xbt_dynar_insert_at (buffer, i, &tbi);