X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f3e7df6480d8da4db694b9ba382fa8c416ed916..e068a3ed416ad96c6dd7ed09d7675644c4a3324e:/src/instr/instr_paje_trace.c

diff --git a/src/instr/instr_paje_trace.c b/src/instr/instr_paje_trace.c
index f7aeea9454..d284dc63e3 100644
--- a/src/instr/instr_paje_trace.c
+++ b/src/instr/instr_paje_trace.c
@@ -155,9 +155,9 @@ void TRACE_paje_start(void)
 {
   char *filename = TRACE_get_filename();
   tracing_file = fopen(filename, "w");
-  xbt_assert1 (tracing_file != NULL, "Tracefile %s could not be opened for writing.", filename);
+  xbt_assert (tracing_file != NULL, "Tracefile %s could not be opened for writing.", filename);
 
-  DEBUG1("Filename %s is open for writing", filename);
+  XBT_DEBUG("Filename %s is open for writing", filename);
 
   /* output header */
   TRACE_paje_create_header();
@@ -169,14 +169,14 @@ void TRACE_paje_end(void)
 {
   fclose(tracing_file);
   char *filename = TRACE_get_filename();
-  DEBUG1("Filename %s is closed", filename);
+  XBT_DEBUG("Filename %s is closed", filename);
 }
 
 double TRACE_last_timestamp_to_dump = 0;
 //dumps the trace file until the timestamp TRACE_last_timestamp_to_dump
 void TRACE_paje_dump_buffer (int force)
 {
-  DEBUG2("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump);
+  XBT_DEBUG("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump);
   if (force){
     paje_event_t event;
     unsigned int i;
@@ -198,12 +198,12 @@ void TRACE_paje_dump_buffer (int force)
       event->free (event);
     }
   }
-  DEBUG1("%s: ends", __FUNCTION__);
+  XBT_DEBUG("%s: ends", __FUNCTION__);
 }
 
 void TRACE_paje_create_header(void)
 {
-  DEBUG0 ("Define paje header");
+  XBT_DEBUG ("Define paje header");
   fprintf(tracing_file, "\
 %%EventDef PajeDefineContainerType %d \n\
 %%       Alias string \n\
@@ -331,42 +331,47 @@ void TRACE_paje_create_header(void)
 /* internal do the instrumentation module */
 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));
+  if (TRACE_buffer() == 0){
+    tbi->print (tbi);
+    tbi->free (tbi);
+    return;
+  }
+  XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%ld)", __FUNCTION__, tbi->event_type, tbi->timestamp, xbt_dynar_length(buffer));
 
   unsigned int i;
   unsigned long len = xbt_dynar_length(buffer);
   if (len == 0){
     xbt_dynar_push (buffer, &tbi);
-    DEBUG1("%s: inserted at beginning", __FUNCTION__);
+    XBT_DEBUG("%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_DEBUG("%s: inserted at end, pos = %ld", __FUNCTION__, len);
       xbt_dynar_insert_at (buffer, len, &tbi);
       return;
     }
     int inserted = 0;
-    for (i = 0; i < len; i++){
+    for (i = len-1; i > 0; 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);
-        DEBUG2("%s: inserted at %d", __FUNCTION__, i);
+      if (e1->timestamp <= tbi->timestamp){
+        xbt_dynar_insert_at (buffer, i+1, &tbi);
+        XBT_DEBUG("%s: inserted at %d", __FUNCTION__, i+1);
         inserted = 1;
         break;
       }
     }
     if (!inserted){
       xbt_dynar_push (buffer, &tbi);
-      DEBUG1("%s: inserted at end", __FUNCTION__);
+      XBT_DEBUG("%s: inserted at end", __FUNCTION__);
     }
   }
 }
 
 static void print_pajeDefineContainerType(paje_event_t event)
 {
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
   fprintf(tracing_file, "%d %s %s %s\n",
       event->event_type,
       ((defineContainerType_t)event->data)->type->id,
@@ -376,7 +381,7 @@ static void print_pajeDefineContainerType(paje_event_t event)
 
 static void print_pajeDefineVariableType(paje_event_t event)
 {
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
       event->event_type,
       ((defineVariableType_t)event->data)->type->id,
@@ -387,7 +392,7 @@ static void print_pajeDefineVariableType(paje_event_t event)
 
 static void print_pajeDefineStateType(paje_event_t event)
 {
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
   fprintf(tracing_file, "%d %s %s %s\n",
       event->event_type,
       ((defineStateType_t)event->data)->type->id,
@@ -397,7 +402,7 @@ static void print_pajeDefineStateType(paje_event_t event)
 
 static void print_pajeDefineEventType(paje_event_t event)
 {
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
       event->event_type,
       ((defineEventType_t)event->data)->type->id,
@@ -408,7 +413,7 @@ static void print_pajeDefineEventType(paje_event_t event)
 
 static void print_pajeDefineLinkType(paje_event_t event)
 {
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
   fprintf(tracing_file, "%d %s %s %s %s %s\n",
       event->event_type,
       ((defineLinkType_t)event->data)->type->id,
@@ -420,7 +425,7 @@ static void print_pajeDefineLinkType(paje_event_t event)
 
 static void print_pajeDefineEntityValue (paje_event_t event)
 {
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
   fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
       event->event_type,
       ((defineEntityValue_t)event->data)->value->id,
@@ -431,7 +436,7 @@ static void print_pajeDefineEntityValue (paje_event_t event)
 
 static void print_pajeCreateContainer(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s %s\n",
         event->event_type,
@@ -452,7 +457,7 @@ static void print_pajeCreateContainer(paje_event_t event)
 
 static void print_pajeDestroyContainer(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",
         event->event_type,
@@ -469,7 +474,7 @@ static void print_pajeDestroyContainer(paje_event_t event)
 
 static void print_pajeSetVariable(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
         event->event_type,
@@ -488,7 +493,7 @@ static void print_pajeSetVariable(paje_event_t event)
 
 static void print_pajeAddVariable(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
         event->event_type,
@@ -507,7 +512,7 @@ static void print_pajeAddVariable(paje_event_t event)
 
 static void print_pajeSubVariable(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
         event->event_type,
@@ -526,7 +531,7 @@ static void print_pajeSubVariable(paje_event_t event)
 
 static void print_pajeSetState(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",
         event->event_type,
@@ -545,7 +550,7 @@ static void print_pajeSetState(paje_event_t event)
 
 static void print_pajePushState(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",
         event->event_type,
@@ -564,7 +569,7 @@ static void print_pajePushState(paje_event_t event)
 
 static void print_pajePopState(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",
         event->event_type,
@@ -581,7 +586,7 @@ static void print_pajePopState(paje_event_t event)
 
 static void print_pajeStartLink(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
         event->event_type,
@@ -604,7 +609,7 @@ static void print_pajeStartLink(paje_event_t event)
 
 static void print_pajeEndLink(paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
         event->event_type,
@@ -627,7 +632,7 @@ static void print_pajeEndLink(paje_event_t event)
 
 static void print_pajeNewEvent (paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",
         event->event_type,
@@ -646,7 +651,7 @@ static void print_pajeNewEvent (paje_event_t event)
 
 static void free_paje_event (paje_event_t event)
 {
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
   if (event->event_type == PAJE_StartLink){
     xbt_free (((startLink_t)(event->data))->value);
     xbt_free (((startLink_t)(event->data))->key);
@@ -668,7 +673,7 @@ void new_pajeDefineContainerType(type_t type)
   event->data = xbt_new0(s_defineContainerType_t, 1);
   ((defineContainerType_t)(event->data))->type = type;
 
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
 
   //print it
   event->print (event);
@@ -685,7 +690,7 @@ void new_pajeDefineVariableType(type_t type)
   event->data = xbt_new0(s_defineVariableType_t, 1);
   ((defineVariableType_t)(event->data))->type = type;
 
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
 
   //print it
   event->print (event);
@@ -702,7 +707,7 @@ void new_pajeDefineStateType(type_t type)
   event->data = xbt_new0(s_defineStateType_t, 1);
   ((defineStateType_t)(event->data))->type = type;
 
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
 
   //print it
   event->print (event);
@@ -719,7 +724,7 @@ void new_pajeDefineEventType(type_t type)
   event->data = xbt_new0(s_defineEventType_t, 1);
   ((defineEventType_t)(event->data))->type = type;
 
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
 
   //print it
   event->print (event);
@@ -738,7 +743,7 @@ void new_pajeDefineLinkType(type_t type, type_t source, type_t dest)
   ((defineLinkType_t)(event->data))->source = source;
   ((defineLinkType_t)(event->data))->dest = dest;
 
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
 
   //print it
   event->print (event);
@@ -755,7 +760,7 @@ void new_pajeDefineEntityValue (val_t value)
   event->data = xbt_new0(s_defineEntityValue_t, 1);
   ((defineEntityValue_t)(event->data))->value = value;
 
-  DEBUG2("%s: event_type=%d", __FUNCTION__, event->event_type);
+  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
 
   //print it
   event->print (event);
@@ -772,7 +777,7 @@ void new_pajeCreateContainer (container_t container)
   event->data = xbt_new0(s_createContainer_t, 1);
   ((createContainer_t)(event->data))->container = container;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   //print it
   event->print (event);
@@ -789,7 +794,7 @@ void new_pajeDestroyContainer (container_t container)
   event->data = xbt_new0(s_destroyContainer_t, 1);
   ((destroyContainer_t)(event->data))->container = container;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   //print it
   event->print (event);
@@ -808,7 +813,7 @@ void new_pajeSetVariable (double timestamp, container_t container, type_t type,
   ((setVariable_t)(event->data))->container = container;
   ((setVariable_t)(event->data))->value = value;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
@@ -826,7 +831,7 @@ void new_pajeAddVariable (double timestamp, container_t container, type_t type,
   ((addVariable_t)(event->data))->container = container;
   ((addVariable_t)(event->data))->value = value;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
@@ -843,7 +848,7 @@ void new_pajeSubVariable (double timestamp, container_t container, type_t type,
   ((subVariable_t)(event->data))->container = container;
   ((subVariable_t)(event->data))->value = value;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
@@ -860,7 +865,7 @@ void new_pajeSetState (double timestamp, container_t container, type_t type, val
   ((setState_t)(event->data))->container = container;
   ((setState_t)(event->data))->value = value;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
@@ -878,7 +883,7 @@ void new_pajePushState (double timestamp, container_t container, type_t type, va
   ((pushState_t)(event->data))->container = container;
   ((pushState_t)(event->data))->value = value;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
@@ -895,7 +900,7 @@ void new_pajePopState (double timestamp, container_t container, type_t type)
   ((popState_t)(event->data))->type = type;
   ((popState_t)(event->data))->container = container;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
@@ -914,7 +919,7 @@ void new_pajeStartLink (double timestamp, container_t container, type_t type, co
   ((startLink_t)(event->data))->value = xbt_strdup(value);
   ((startLink_t)(event->data))->key = xbt_strdup(key);
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
@@ -933,7 +938,7 @@ void new_pajeEndLink (double timestamp, container_t container, type_t type, cont
   ((endLink_t)(event->data))->value = xbt_strdup(value);
   ((endLink_t)(event->data))->key = xbt_strdup(key);
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }
@@ -950,7 +955,7 @@ void new_pajeNewEvent (double timestamp, container_t container, type_t type, val
   ((newEvent_t)(event->data))->container = container;
   ((newEvent_t)(event->data))->value = value;
 
-  DEBUG3("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
 
   insert_into_buffer (event);
 }