move all inst declarations into their namespace

[simgrid.git] / src / instr / instr_paje_header.cpp

diff --git a/src/instr/instr_paje_header.cpp b/src/instr/instr_paje_header.cpp
index 90514aa..4f49363 100644 (file)
--- a/src/instr/instr_paje_header.cpp
+++ b/src/instr/instr_paje_header.cpp
@@ -5,6 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/instr/instr_private.h"
+#include "simgrid/sg_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_header, instr, "Paje tracing event system (header)");
 
@@ -12,7 +13,7 @@ extern FILE *tracing_file;
 
 static void TRACE_header_PajeDefineContainerType (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineContainerType %d\n", PAJE_DefineContainerType);
+  fprintf(tracing_file, "%%EventDef PajeDefineContainerType %d\n", simgrid::instr::PAJE_DefineContainerType);
   fprintf(tracing_file, "%%       Alias string\n");
   if (basic){
     fprintf(tracing_file, "%%       ContainerType string\n");
@@ -25,7 +26,7 @@ static void TRACE_header_PajeDefineContainerType (int basic, int size)
 
 static void TRACE_header_PajeDefineVariableType (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineVariableType %d\n", PAJE_DefineVariableType);
+  fprintf(tracing_file, "%%EventDef PajeDefineVariableType %d\n", simgrid::instr::PAJE_DefineVariableType);
   fprintf(tracing_file, "%%       Alias string\n");
   if (basic){
     fprintf(tracing_file, "%%       ContainerType string\n");
@@ -39,7 +40,7 @@ static void TRACE_header_PajeDefineVariableType (int basic, int size)
 
 static void TRACE_header_PajeDefineStateType (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineStateType %d\n", PAJE_DefineStateType);
+  fprintf(tracing_file, "%%EventDef PajeDefineStateType %d\n", simgrid::instr::PAJE_DefineStateType);
   fprintf(tracing_file, "%%       Alias string\n");
   if (basic){
     fprintf(tracing_file, "%%       ContainerType string\n");
@@ -52,7 +53,7 @@ static void TRACE_header_PajeDefineStateType (int basic, int size)
 
 static void TRACE_header_PajeDefineEventType (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineEventType %d\n", PAJE_DefineEventType);
+  fprintf(tracing_file, "%%EventDef PajeDefineEventType %d\n", simgrid::instr::PAJE_DefineEventType);
   fprintf(tracing_file, "%%       Alias string\n");
   if (basic){
     fprintf(tracing_file, "%%       ContainerType string\n");
@@ -65,7 +66,7 @@ static void TRACE_header_PajeDefineEventType (int basic, int size)
 
 static void TRACE_header_PajeDefineLinkType (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineLinkType %d\n", PAJE_DefineLinkType);
+  fprintf(tracing_file, "%%EventDef PajeDefineLinkType %d\n", simgrid::instr::PAJE_DefineLinkType);
   fprintf(tracing_file, "%%       Alias string\n");
   if (basic){
     fprintf(tracing_file, "%%       ContainerType string\n");
@@ -82,7 +83,7 @@ static void TRACE_header_PajeDefineLinkType (int basic, int size)
 
 static void TRACE_header_PajeDefineEntityValue (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeDefineEntityValue %d\n", PAJE_DefineEntityValue);
+  fprintf(tracing_file, "%%EventDef PajeDefineEntityValue %d\n", simgrid::instr::PAJE_DefineEntityValue);
   fprintf(tracing_file, "%%       Alias string\n");
   if (basic){
     fprintf(tracing_file, "%%       EntityType string\n");
@@ -96,7 +97,7 @@ static void TRACE_header_PajeDefineEntityValue (int basic, int size)
 
 static void TRACE_header_PajeCreateContainer (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeCreateContainer %d\n", PAJE_CreateContainer);
+  fprintf(tracing_file, "%%EventDef PajeCreateContainer %d\n", simgrid::instr::PAJE_CreateContainer);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Alias string\n");
   fprintf(tracing_file, "%%       Type string\n");
@@ -107,7 +108,7 @@ static void TRACE_header_PajeCreateContainer (int basic, int size)
 
 static void TRACE_header_PajeDestroyContainer (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeDestroyContainer %d\n", PAJE_DestroyContainer);
+  fprintf(tracing_file, "%%EventDef PajeDestroyContainer %d\n", simgrid::instr::PAJE_DestroyContainer);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Name string\n");
@@ -116,7 +117,7 @@ static void TRACE_header_PajeDestroyContainer (int basic, int size)
 
 static void TRACE_header_PajeSetVariable (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeSetVariable %d\n", PAJE_SetVariable);
+  fprintf(tracing_file, "%%EventDef PajeSetVariable %d\n", simgrid::instr::PAJE_SetVariable);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");
@@ -126,7 +127,7 @@ static void TRACE_header_PajeSetVariable (int basic, int size)
 
 static void TRACE_header_PajeAddVariable (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeAddVariable %d\n", PAJE_AddVariable);
+  fprintf(tracing_file, "%%EventDef PajeAddVariable %d\n", simgrid::instr::PAJE_AddVariable);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");
@@ -136,7 +137,7 @@ static void TRACE_header_PajeAddVariable (int basic, int size)
 
 static void TRACE_header_PajeSubVariable (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeSubVariable %d\n", PAJE_SubVariable);
+  fprintf(tracing_file, "%%EventDef PajeSubVariable %d\n", simgrid::instr::PAJE_SubVariable);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");
@@ -147,7 +148,7 @@ static void TRACE_header_PajeSubVariable (int basic, int size)
 
 static void TRACE_header_PajeSetState (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeSetState %d\n", PAJE_SetState);
+  fprintf(tracing_file, "%%EventDef PajeSetState %d\n", simgrid::instr::PAJE_SetState);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");
@@ -157,22 +158,28 @@ static void TRACE_header_PajeSetState (int basic, int size)
 
 static void TRACE_header_PajePushState (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajePushState %d\n", PAJE_PushState);
+  fprintf(tracing_file, "%%EventDef PajePushState %d\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");
-  if (false) {
-    fprintf(tracing_file, "%%       Filename string\n");
-    fprintf(tracing_file, "%%       Linenumber int\n");
+#if HAVE_SMPI
+  if (xbt_cfg_get_boolean("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");
   }
+#endif
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
 static void TRACE_header_PajePopState (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajePopState %d\n", PAJE_PopState);
+  fprintf(tracing_file, "%%EventDef PajePopState %d\n", simgrid::instr::PAJE_PopState);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");
@@ -183,7 +190,7 @@ static void TRACE_header_PajeResetState (int basic, int size)
 {
   if (basic) return;
 
-  fprintf(tracing_file, "%%EventDef PajeResetState %d\n", PAJE_ResetState);
+  fprintf(tracing_file, "%%EventDef PajeResetState %d\n", simgrid::instr::PAJE_ResetState);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");
@@ -192,7 +199,7 @@ static void TRACE_header_PajeResetState (int basic, int size)
 
 static void TRACE_header_PajeStartLink (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeStartLink %d\n", PAJE_StartLink);
+  fprintf(tracing_file, "%%EventDef PajeStartLink %d\n", simgrid::instr::PAJE_StartLink);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");
@@ -209,7 +216,7 @@ static void TRACE_header_PajeStartLink (int basic, int size)
 
 static void TRACE_header_PajeEndLink (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeEndLink %d\n", PAJE_EndLink);
+  fprintf(tracing_file, "%%EventDef PajeEndLink %d\n", simgrid::instr::PAJE_EndLink);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");
@@ -225,7 +232,7 @@ static void TRACE_header_PajeEndLink (int basic, int size)
 
 static void TRACE_header_PajeNewEvent (int basic, int size)
 {
-  fprintf(tracing_file, "%%EventDef PajeNewEvent %d\n", PAJE_NewEvent);
+  fprintf(tracing_file, "%%EventDef PajeNewEvent %d\n", simgrid::instr::PAJE_NewEvent);
   fprintf(tracing_file, "%%       Time date\n");
   fprintf(tracing_file, "%%       Type string\n");
   fprintf(tracing_file, "%%       Container string\n");