X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8842f6e9b70113e86aed3525099b028c6bd0535c..43a0164423a362ec7c68b23a7c004988c69a4010:/src/instr/instr_paje_trace.c

diff --git a/src/instr/instr_paje_trace.c b/src/instr/instr_paje_trace.c
index e99bb30572..ae6cb795fc 100644
--- a/src/instr/instr_paje_trace.c
+++ b/src/instr/instr_paje_trace.c
@@ -12,7 +12,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;
 
-
 void TRACE_paje_init(void)
 {
   active_writer.print_DefineContainerType=print_pajeDefineContainerType;
@@ -140,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,
@@ -149,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,
@@ -161,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);
@@ -178,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,
@@ -186,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,
@@ -197,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,
@@ -205,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,
@@ -216,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,
@@ -224,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,
@@ -235,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,
@@ -243,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,
@@ -254,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",
@@ -263,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,
@@ -285,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,
@@ -311,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);
@@ -328,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);
@@ -355,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,
@@ -365,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,
@@ -376,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,
@@ -391,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,
@@ -401,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,
@@ -414,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,
@@ -422,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,