try to fix some compilation erros

[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 91bfb95..5416d0a 100644 (file)
--- a/src/instr/instr_paje_trace.c
+++ b/src/instr/instr_paje_trace.c
@@ -1,8 +1,8 @@
-/* Copyright (c) 2010-2013. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
-  * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "instr/instr_private.h"
 #include "xbt/virtu.h" /* sg_cmdline */
@@ -11,8 +11,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr_trace, "tracing event sy
 
 extern FILE * tracing_file;
 extern s_instr_trace_writer_t active_writer;
-extern xbt_dynar_t buffer;
-
 
 void TRACE_paje_init(void)
 {
@@ -65,14 +63,12 @@ void TRACE_paje_start(void)
   /* output header */
   TRACE_header(TRACE_basic(),TRACE_display_sizes());
 
-  buffer = xbt_dynar_new (sizeof(paje_event_t), NULL);
 }
 
 void TRACE_paje_end(void)
 {
   fclose(tracing_file);
   char *filename = TRACE_get_filename();
-  xbt_dynar_free (&buffer);
   XBT_DEBUG("Filename %s is closed", filename);
 }
 
@@ -143,7 +139,7 @@ void print_pajeDefineEntityValue (paje_event_t event)
 
 void print_pajeCreateContainer(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s \"%s\"\n",
         (int)event->event_type,
@@ -152,8 +148,9 @@ void print_pajeCreateContainer(paje_event_t event)
         ((createContainer_t)event->data)->container->father->id,
         ((createContainer_t)event->data)->container->name);
   }else{
-    fprintf(tracing_file, "%d %f %s %s %s \"%s\"\n",
+    fprintf(tracing_file, "%d %.*f %s %s %s \"%s\"\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((createContainer_t)event->data)->container->id,
         ((createContainer_t)event->data)->container->type->id,
@@ -164,15 +161,16 @@ void print_pajeCreateContainer(paje_event_t event)
 
 void print_pajeDestroyContainer(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",
         (int)event->event_type,
         ((destroyContainer_t)event->data)->container->type->id,
         ((destroyContainer_t)event->data)->container->id);
   }else{
-    fprintf(tracing_file, "%d %f %s %s\n",
+    fprintf(tracing_file, "%d %.*f %s %s\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((destroyContainer_t)event->data)->container->type->id,
         ((destroyContainer_t)event->data)->container->id);
@@ -181,7 +179,7 @@ void print_pajeDestroyContainer(paje_event_t event)
 
 void print_pajeSetVariable(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
         (int)event->event_type,
@@ -189,8 +187,9 @@ void print_pajeSetVariable(paje_event_t event)
         ((setVariable_t)event->data)->container->id,
         ((setVariable_t)event->data)->value);
   }else{
-    fprintf(tracing_file, "%d %f %s %s %f\n",
+    fprintf(tracing_file, "%d %.*f %s %s %f\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((setVariable_t)event->data)->type->id,
         ((setVariable_t)event->data)->container->id,
@@ -200,7 +199,7 @@ void print_pajeSetVariable(paje_event_t event)
 
 void print_pajeAddVariable(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
         (int)event->event_type,
@@ -208,8 +207,9 @@ void print_pajeAddVariable(paje_event_t event)
         ((addVariable_t)event->data)->container->id,
         ((addVariable_t)event->data)->value);
   }else{
-    fprintf(tracing_file, "%d %f %s %s %f\n",
+    fprintf(tracing_file, "%d %.*f %s %s %f\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((addVariable_t)event->data)->type->id,
         ((addVariable_t)event->data)->container->id,
@@ -219,7 +219,7 @@ void print_pajeAddVariable(paje_event_t event)
 
 void print_pajeSubVariable(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %f\n",
         (int)event->event_type,
@@ -227,8 +227,9 @@ void print_pajeSubVariable(paje_event_t event)
         ((subVariable_t)event->data)->container->id,
         ((subVariable_t)event->data)->value);
   }else{
-    fprintf(tracing_file, "%d %f %s %s %f\n",
+    fprintf(tracing_file, "%d %.*f %s %s %f\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((subVariable_t)event->data)->type->id,
         ((subVariable_t)event->data)->container->id,
@@ -238,7 +239,7 @@ void print_pajeSubVariable(paje_event_t event)
 
 void print_pajeSetState(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",
         (int)event->event_type,
@@ -246,8 +247,9 @@ void print_pajeSetState(paje_event_t event)
         ((setState_t)event->data)->container->id,
         ((setState_t)event->data)->value->id);
   }else{
-    fprintf(tracing_file, "%d %f %s %s %s\n",
+    fprintf(tracing_file, "%d %.*f %s %s %s\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((setState_t)event->data)->type->id,
         ((setState_t)event->data)->container->id,
@@ -257,7 +259,7 @@ void print_pajeSetState(paje_event_t event)
 
 void print_pajePushState(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (!TRACE_display_sizes()){
     if (event->timestamp == 0){
       fprintf(tracing_file, "%d 0 %s %s %s\n",
@@ -266,8 +268,9 @@ void print_pajePushState(paje_event_t event)
           ((pushState_t)event->data)->container->id,
           ((pushState_t)event->data)->value->id);
     }else{
-      fprintf(tracing_file, "%d %f %s %s %s\n",
+      fprintf(tracing_file, "%d %.*f %s %s %s\n",
           (int)event->event_type,
+          TRACE_precision(),
           event->timestamp,
           ((pushState_t)event->data)->type->id,
           ((pushState_t)event->data)->container->id,
@@ -288,8 +291,9 @@ void print_pajePushState(paje_event_t event)
       fprintf(tracing_file, "\n");
 
     }else{
-      fprintf(tracing_file, "%d %f %s %s %s ",
+      fprintf(tracing_file, "%d %.*f %s %s %s ",
           (int)event->event_type,
+          TRACE_precision(),
           event->timestamp,
           ((pushState_t)event->data)->type->id,
           ((pushState_t)event->data)->container->id,
@@ -314,15 +318,16 @@ void print_pajePushState(paje_event_t event)
 
 void print_pajePopState(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",
         (int)event->event_type,
         ((popState_t)event->data)->type->id,
         ((popState_t)event->data)->container->id);
   }else{
-    fprintf(tracing_file, "%d %f %s %s\n",
+    fprintf(tracing_file, "%d %.*f %s %s\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((popState_t)event->data)->type->id,
         ((popState_t)event->data)->container->id);
@@ -331,15 +336,16 @@ void print_pajePopState(paje_event_t event)
 
 void print_pajeResetState(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s\n",
         (int)event->event_type,
         ((resetState_t)event->data)->type->id,
         ((resetState_t)event->data)->container->id);
   }else{
-    fprintf(tracing_file, "%d %f %s %s\n",
+    fprintf(tracing_file, "%d %.*f %s %s\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((resetState_t)event->data)->type->id,
         ((resetState_t)event->data)->container->id);
@@ -358,8 +364,9 @@ void print_pajeStartLink(paje_event_t event)
           ((startLink_t)event->data)->sourceContainer->id,
           ((startLink_t)event->data)->key);
     }else {
-      fprintf(tracing_file, "%d %f %s %s %s %s %s\n",
+      fprintf(tracing_file, "%d %.*f %s %s %s %s %s\n",
           (int)event->event_type,
+          TRACE_precision(),
           event->timestamp,
           ((startLink_t)event->data)->type->id,
           ((startLink_t)event->data)->container->id,
@@ -368,7 +375,7 @@ void print_pajeStartLink(paje_event_t event)
           ((startLink_t)event->data)->key);
     }
   }else{
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
     if (event->timestamp == 0){
       fprintf(tracing_file, "%d 0 %s %s %s %s %s %d\n",
           (int)event->event_type,
@@ -379,8 +386,9 @@ void print_pajeStartLink(paje_event_t event)
           ((startLink_t)event->data)->key,
           ((startLink_t)event->data)->size);
     }else {
-      fprintf(tracing_file, "%d %f %s %s %s %s %s %d\n",
+      fprintf(tracing_file, "%d %.*f %s %s %s %s %s %d\n",
           (int)event->event_type,
+          TRACE_precision(),
           event->timestamp,
           ((startLink_t)event->data)->type->id,
           ((startLink_t)event->data)->container->id,
@@ -394,7 +402,7 @@ void print_pajeStartLink(paje_event_t event)
 
 void print_pajeEndLink(paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
         (int)event->event_type,
@@ -404,8 +412,9 @@ void print_pajeEndLink(paje_event_t event)
         ((endLink_t)event->data)->destContainer->id,
         ((endLink_t)event->data)->key);
   }else {
-    fprintf(tracing_file, "%d %f %s %s %s %s %s\n",
+    fprintf(tracing_file, "%d %.*f %s %s %s %s %s\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((endLink_t)event->data)->type->id,
         ((endLink_t)event->data)->container->id,
@@ -417,7 +426,7 @@ void print_pajeEndLink(paje_event_t event)
 
 void print_pajeNewEvent (paje_event_t event)
 {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(), event->timestamp);
   if (event->timestamp == 0){
     fprintf(tracing_file, "%d 0 %s %s %s\n",
         (int)event->event_type,
@@ -425,8 +434,9 @@ void print_pajeNewEvent (paje_event_t event)
         ((newEvent_t)event->data)->container->id,
         ((newEvent_t)event->data)->value->id);
   }else{
-    fprintf(tracing_file, "%d %f %s %s %s\n",
+    fprintf(tracing_file, "%d %.*f %s %s %s\n",
         (int)event->event_type,
+        TRACE_precision(),
         event->timestamp,
         ((newEvent_t)event->data)->type->id,
         ((newEvent_t)event->data)->container->id,