X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..c4000f89d4644c3d7ff6187a62a0930c4d53e683:/src/instr/instr_paje_header.cpp

diff --git a/src/instr/instr_paje_header.cpp b/src/instr/instr_paje_header.cpp
index 26dca6a43d..9e4de83ac3 100644
--- a/src/instr/instr_paje_header.cpp
+++ b/src/instr/instr_paje_header.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012-2018. The SimGrid Team.
+/* Copyright (c) 2010-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,182 +7,181 @@
 #include "simgrid/sg_config.hpp"
 #include "src/instr/instr_private.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_header, instr, "Paje tracing event system (header)");
-
-extern FILE *tracing_file;
+extern std::ofstream tracing_file;
 
 static void TRACE_header_PajeDefineContainerType(bool basic)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineContainerType %u\n", simgrid::instr::PAJE_DefineContainerType);
-  fprintf(tracing_file, "%%       Alias string\n");
+  tracing_file << "%EventDef PajeDefineContainerType " << simgrid::instr::PAJE_DefineContainerType << std::endl;
+  tracing_file << "%       Alias string" << std::endl;
   if (basic){
-    fprintf(tracing_file, "%%       ContainerType string\n");
+    tracing_file << "%       ContainerType string" << std::endl;
   }else{
-    fprintf(tracing_file, "%%       Type string\n");
+    tracing_file << "%       Type string" << std::endl;
   }
-  fprintf(tracing_file, "%%       Name string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%       Name string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeDefineVariableType(bool basic)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineVariableType %u\n", simgrid::instr::PAJE_DefineVariableType);
-  fprintf(tracing_file, "%%       Alias string\n");
+  tracing_file << "%EventDef PajeDefineVariableType " << simgrid::instr::PAJE_DefineVariableType << std::endl;
+  tracing_file << "%       Alias string" << std::endl;
   if (basic){
-    fprintf(tracing_file, "%%       ContainerType string\n");
+    tracing_file << "%       ContainerType string" << std::endl;
   }else{
-    fprintf(tracing_file, "%%       Type string\n");
+    tracing_file << "%       Type string" << std::endl;
   }
-  fprintf(tracing_file, "%%       Name string\n");
-  fprintf(tracing_file, "%%       Color color\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%       Name string" << std::endl;
+  tracing_file << "%       Color color" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeDefineStateType(bool basic)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineStateType %u\n", simgrid::instr::PAJE_DefineStateType);
-  fprintf(tracing_file, "%%       Alias string\n");
+  tracing_file << "%EventDef PajeDefineStateType " << simgrid::instr::PAJE_DefineStateType << std::endl;
+  tracing_file << "%       Alias string" << std::endl;
   if (basic){
-    fprintf(tracing_file, "%%       ContainerType string\n");
+    tracing_file << "%       ContainerType string" << std::endl;
   }else{
-    fprintf(tracing_file, "%%       Type string\n");
+    tracing_file << "%       Type string" << std::endl;
   }
-  fprintf(tracing_file, "%%       Name string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%       Name string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeDefineEventType(bool basic)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineEventType %u\n", simgrid::instr::PAJE_DefineEventType);
-  fprintf(tracing_file, "%%       Alias string\n");
+  tracing_file << "%EventDef PajeDefineEventType " << simgrid::instr::PAJE_DefineEventType << std::endl;
+  tracing_file << "%       Alias string" << std::endl;
   if (basic){
-    fprintf(tracing_file, "%%       ContainerType string\n");
+    tracing_file << "%       ContainerType string" << std::endl;
   }else{
-    fprintf(tracing_file, "%%       Type string\n");
+    tracing_file << "%       Type string" << std::endl;
   }
-  fprintf(tracing_file, "%%       Name string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%       Name string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeDefineLinkType(bool basic)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineLinkType %u\n", simgrid::instr::PAJE_DefineLinkType);
-  fprintf(tracing_file, "%%       Alias string\n");
+  tracing_file << "%EventDef PajeDefineLinkType " << simgrid::instr::PAJE_DefineLinkType << std::endl;
+  tracing_file << "%       Alias string" << std::endl;
   if (basic){
-    fprintf(tracing_file, "%%       ContainerType string\n");
-    fprintf(tracing_file, "%%       SourceContainerType string\n");
-    fprintf(tracing_file, "%%       DestContainerType string\n");
+    tracing_file << "%       ContainerType string" << std::endl;
+    tracing_file << "%       SourceContainerType string" << std::endl;
+    tracing_file << "%       DestContainerType string" << std::endl;
   }else{
-    fprintf(tracing_file, "%%       Type string\n");
-    fprintf(tracing_file, "%%       StartContainerType string\n");
-    fprintf(tracing_file, "%%       EndContainerType string\n");
+    tracing_file << "%       Type string" << std::endl;
+    tracing_file << "%       StartContainerType string" << std::endl;
+    tracing_file << "%       EndContainerType string" << std::endl;
   }
-  fprintf(tracing_file, "%%       Name string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%       Name string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeDefineEntityValue(bool basic)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineEntityValue %u\n", simgrid::instr::PAJE_DefineEntityValue);
-  fprintf(tracing_file, "%%       Alias string\n");
+  tracing_file << "%EventDef PajeDefineEntityValue " << simgrid::instr::PAJE_DefineEntityValue << std::endl;
+  tracing_file << "%       Alias string" << std::endl;
   if (basic){
-    fprintf(tracing_file, "%%       EntityType string\n");
+    tracing_file << "%       EntityType string" << std::endl;
   }else{
-    fprintf(tracing_file, "%%       Type string\n");
+    tracing_file << "%       Type string" << std::endl;
   }
-  fprintf(tracing_file, "%%       Name string\n");
-  fprintf(tracing_file, "%%       Color color\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%       Name string" << std::endl;
+  tracing_file << "%       Color color" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeCreateContainer()
 {
-  fprintf(tracing_file, "%%EventDef PajeCreateContainer %u\n", simgrid::instr::PAJE_CreateContainer);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Alias string\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Name string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajeCreateContainer " << simgrid::instr::PAJE_CreateContainer << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Alias string" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Name string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeDestroyContainer()
 {
-  fprintf(tracing_file, "%%EventDef PajeDestroyContainer %u\n", simgrid::instr::PAJE_DestroyContainer);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Name string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajeDestroyContainer " << simgrid::instr::PAJE_DestroyContainer << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Name string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeSetVariable()
 {
-  fprintf(tracing_file, "%%EventDef PajeSetVariable %u\n", simgrid::instr::PAJE_SetVariable);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Value double\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajeSetVariable " << simgrid::instr::PAJE_SetVariable << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Value double" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeAddVariable()
 {
-  fprintf(tracing_file, "%%EventDef PajeAddVariable %u\n", simgrid::instr::PAJE_AddVariable);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Value double\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajeAddVariable " << simgrid::instr::PAJE_AddVariable << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Value double" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeSubVariable()
 {
-  fprintf(tracing_file, "%%EventDef PajeSubVariable %u\n", simgrid::instr::PAJE_SubVariable);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Value double\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajeSubVariable " << simgrid::instr::PAJE_SubVariable << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Value double" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeSetState()
 {
-  fprintf(tracing_file, "%%EventDef PajeSetState %u\n", simgrid::instr::PAJE_SetState);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Value string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajeSetState " << simgrid::instr::PAJE_SetState << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Value string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajePushState(int size)
 {
-  fprintf(tracing_file, "%%EventDef PajePushState %u\n", simgrid::instr::PAJE_PushState);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Value string\n");
-  if (size) fprintf(tracing_file, "%%       Size int\n");
+  tracing_file << "%EventDef PajePushState " << simgrid::instr::PAJE_PushState << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Value string" << std::endl;
+  if (size)
+    tracing_file << "%       Size int" << std::endl;
 #if HAVE_SMPI
-  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+  if (simgrid::config::get_value<bool>("smpi/trace-call-location")) {
     /**
      * paje currently (May 2016) uses "Filename" and "Linenumber" as
      * reserved words. We cannot use them...
      */
-    fprintf(tracing_file, "%%       Fname string\n");
-    fprintf(tracing_file, "%%       Lnumber int\n");
+    tracing_file << "%       Fname string" << std::endl;
+    tracing_file << "%       Lnumber int" << std::endl;
   }
 #endif
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajePopState()
 {
-  fprintf(tracing_file, "%%EventDef PajePopState %u\n", simgrid::instr::PAJE_PopState);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajePopState " << simgrid::instr::PAJE_PopState << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeResetState(bool basic)
@@ -190,59 +189,59 @@ static void TRACE_header_PajeResetState(bool basic)
   if (basic)
     return;
 
-  fprintf(tracing_file, "%%EventDef PajeResetState %u\n", simgrid::instr::PAJE_ResetState);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajeResetState " << simgrid::instr::PAJE_ResetState << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
-static void TRACE_header_PajeStartLink(bool basic, int size)
+static void TRACE_header_PajeStartLink(bool basic, bool size)
 {
-  fprintf(tracing_file, "%%EventDef PajeStartLink %u\n", simgrid::instr::PAJE_StartLink);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Value string\n");
+  tracing_file << "%EventDef PajeStartLink " << simgrid::instr::PAJE_StartLink << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Value string" << std::endl;
   if (basic){
-    fprintf(tracing_file, "%%       SourceContainer string\n");
+    tracing_file << "%       SourceContainer string" << std::endl;
   }else{
-    fprintf(tracing_file, "%%       StartContainer string\n");
+    tracing_file << "%       StartContainer string" << std::endl;
   }
-  fprintf(tracing_file, "%%       Key string\n");
-  if (size) fprintf(tracing_file, "%%       Size int\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%       Key string" << std::endl;
+  if (size)
+    tracing_file << "%       Size int" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeEndLink(bool basic)
 {
-  fprintf(tracing_file, "%%EventDef PajeEndLink %u\n", simgrid::instr::PAJE_EndLink);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Value string\n");
+  tracing_file << "%EventDef PajeEndLink " << simgrid::instr::PAJE_EndLink << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Value string" << std::endl;
   if (basic){
-    fprintf(tracing_file, "%%       DestContainer string\n");
+    tracing_file << "%       DestContainer string" << std::endl;
   }else{
-    fprintf(tracing_file, "%%       EndContainer string\n");
+    tracing_file << "%       EndContainer string" << std::endl;
   }
-  fprintf(tracing_file, "%%       Key string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%       Key string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
 static void TRACE_header_PajeNewEvent()
 {
-  fprintf(tracing_file, "%%EventDef PajeNewEvent %u\n", simgrid::instr::PAJE_NewEvent);
-  fprintf(tracing_file, "%%       Time date\n");
-  fprintf(tracing_file, "%%       Type string\n");
-  fprintf(tracing_file, "%%       Container string\n");
-  fprintf(tracing_file, "%%       Value string\n");
-  fprintf(tracing_file, "%%EndEventDef\n");
+  tracing_file << "%EventDef PajeNewEvent " << simgrid::instr::PAJE_NewEvent << std::endl;
+  tracing_file << "%       Time date" << std::endl;
+  tracing_file << "%       Type string" << std::endl;
+  tracing_file << "%       Container string" << std::endl;
+  tracing_file << "%       Value string" << std::endl;
+  tracing_file << "%EndEventDef" << std::endl;
 }
 
-void TRACE_header(bool basic, int size)
+void TRACE_header(bool basic, bool size)
 {
-  XBT_DEBUG ("Define paje header");
   TRACE_header_PajeDefineContainerType(basic);
   TRACE_header_PajeDefineVariableType(basic);
   TRACE_header_PajeDefineStateType(basic);