remove a few smells in instrumentation

[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 6994075..3b2c584 100644 (file)
--- a/src/instr/instr_paje_header.cpp
+++ b/src/instr/instr_paje_header.cpp
@@ -11,7 +11,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_header, instr, "Paje tracing event sy
 
 extern FILE *tracing_file;
 
-static void TRACE_header_PajeDefineContainerType (int basic, int size)
+static void TRACE_header_PajeDefineContainerType (int basic)
 {
   fprintf(tracing_file, "%%EventDef PajeDefineContainerType %d\n", PAJE_DefineContainerType);
   fprintf(tracing_file, "%%       Alias string\n");
@@ -24,7 +24,7 @@ static void TRACE_header_PajeDefineContainerType (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeDefineVariableType (int basic, int size)
+static void TRACE_header_PajeDefineVariableType (int basic)
 {
   fprintf(tracing_file, "%%EventDef PajeDefineVariableType %d\n", PAJE_DefineVariableType);
   fprintf(tracing_file, "%%       Alias string\n");
@@ -38,7 +38,7 @@ static void TRACE_header_PajeDefineVariableType (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeDefineStateType (int basic, int size)
+static void TRACE_header_PajeDefineStateType (int basic)
 {
   fprintf(tracing_file, "%%EventDef PajeDefineStateType %d\n", PAJE_DefineStateType);
   fprintf(tracing_file, "%%       Alias string\n");
@@ -51,7 +51,7 @@ static void TRACE_header_PajeDefineStateType (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeDefineEventType (int basic, int size)
+static void TRACE_header_PajeDefineEventType (int basic)
 {
   fprintf(tracing_file, "%%EventDef PajeDefineEventType %d\n", PAJE_DefineEventType);
   fprintf(tracing_file, "%%       Alias string\n");
@@ -64,7 +64,7 @@ static void TRACE_header_PajeDefineEventType (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeDefineLinkType (int basic, int size)
+static void TRACE_header_PajeDefineLinkType (int basic)
 {
   fprintf(tracing_file, "%%EventDef PajeDefineLinkType %d\n", PAJE_DefineLinkType);
   fprintf(tracing_file, "%%       Alias string\n");
@@ -81,7 +81,7 @@ static void TRACE_header_PajeDefineLinkType (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeDefineEntityValue (int basic, int size)
+static void TRACE_header_PajeDefineEntityValue (int basic)
 {
   fprintf(tracing_file, "%%EventDef PajeDefineEntityValue %d\n", PAJE_DefineEntityValue);
   fprintf(tracing_file, "%%       Alias string\n");
@@ -95,7 +95,7 @@ static void TRACE_header_PajeDefineEntityValue (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeCreateContainer (int basic, int size)
+static void TRACE_header_PajeCreateContainer ()
 {
   fprintf(tracing_file, "%%EventDef PajeCreateContainer %d\n", PAJE_CreateContainer);
   fprintf(tracing_file, "%%       Time date\n");
@@ -106,7 +106,7 @@ static void TRACE_header_PajeCreateContainer (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeDestroyContainer (int basic, int size)
+static void TRACE_header_PajeDestroyContainer ()
 {
   fprintf(tracing_file, "%%EventDef PajeDestroyContainer %d\n", PAJE_DestroyContainer);
   fprintf(tracing_file, "%%       Time date\n");
@@ -115,7 +115,7 @@ static void TRACE_header_PajeDestroyContainer (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeSetVariable (int basic, int size)
+static void TRACE_header_PajeSetVariable ()
 {
   fprintf(tracing_file, "%%EventDef PajeSetVariable %d\n", PAJE_SetVariable);
   fprintf(tracing_file, "%%       Time date\n");
@@ -125,7 +125,7 @@ static void TRACE_header_PajeSetVariable (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeAddVariable (int basic, int size)
+static void TRACE_header_PajeAddVariable ()
 {
   fprintf(tracing_file, "%%EventDef PajeAddVariable %d\n", PAJE_AddVariable);
   fprintf(tracing_file, "%%       Time date\n");
@@ -135,7 +135,7 @@ static void TRACE_header_PajeAddVariable (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeSubVariable (int basic, int size)
+static void TRACE_header_PajeSubVariable ()
 {
   fprintf(tracing_file, "%%EventDef PajeSubVariable %d\n", PAJE_SubVariable);
   fprintf(tracing_file, "%%       Time date\n");
@@ -146,7 +146,7 @@ static void TRACE_header_PajeSubVariable (int basic, int size)
 }
 
 
-static void TRACE_header_PajeSetState (int basic, int size)
+static void TRACE_header_PajeSetState ()
 {
   fprintf(tracing_file, "%%EventDef PajeSetState %d\n", PAJE_SetState);
   fprintf(tracing_file, "%%       Time date\n");
@@ -156,7 +156,7 @@ static void TRACE_header_PajeSetState (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajePushState (int basic, int size)
+static void TRACE_header_PajePushState (int size)
 {
   fprintf(tracing_file, "%%EventDef PajePushState %d\n", PAJE_PushState);
   fprintf(tracing_file, "%%       Time date\n");
@@ -164,6 +164,7 @@ static void TRACE_header_PajePushState (int basic, int size)
   fprintf(tracing_file, "%%       Container string\n");
   fprintf(tracing_file, "%%       Value string\n");
   if (size) fprintf(tracing_file, "%%       Size int\n");
+#if HAVE_SMPI
   if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
     /**
      * paje currently (May 2016) uses "Filename" and "Linenumber" as
@@ -172,10 +173,11 @@ static void TRACE_header_PajePushState (int basic, int size)
     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)
+static void TRACE_header_PajePopState ()
 {
   fprintf(tracing_file, "%%EventDef PajePopState %d\n", PAJE_PopState);
   fprintf(tracing_file, "%%       Time date\n");
@@ -184,7 +186,7 @@ static void TRACE_header_PajePopState (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeResetState (int basic, int size)
+static void TRACE_header_PajeResetState (int basic)
 {
   if (basic) return;
 
@@ -212,7 +214,7 @@ static void TRACE_header_PajeStartLink (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeEndLink (int basic, int size)
+static void TRACE_header_PajeEndLink (int basic)
 {
   fprintf(tracing_file, "%%EventDef PajeEndLink %d\n", PAJE_EndLink);
   fprintf(tracing_file, "%%       Time date\n");
@@ -228,7 +230,7 @@ static void TRACE_header_PajeEndLink (int basic, int size)
   fprintf(tracing_file, "%%EndEventDef\n");
 }
 
-static void TRACE_header_PajeNewEvent (int basic, int size)
+static void TRACE_header_PajeNewEvent ()
 {
   fprintf(tracing_file, "%%EventDef PajeNewEvent %d\n", PAJE_NewEvent);
   fprintf(tracing_file, "%%       Time date\n");
@@ -241,22 +243,22 @@ static void TRACE_header_PajeNewEvent (int basic, int size)
 void TRACE_header(int basic, int size)
 {
   XBT_DEBUG ("Define paje header");
-  TRACE_header_PajeDefineContainerType (basic, size);
-  TRACE_header_PajeDefineVariableType (basic, size);
-  TRACE_header_PajeDefineStateType (basic, size);
-  TRACE_header_PajeDefineEventType (basic, size);
-  TRACE_header_PajeDefineLinkType (basic, size);
-  TRACE_header_PajeDefineEntityValue (basic, size);
-  TRACE_header_PajeCreateContainer (basic, size);
-  TRACE_header_PajeDestroyContainer (basic, size);
-  TRACE_header_PajeSetVariable (basic, size);
-  TRACE_header_PajeAddVariable (basic, size);
-  TRACE_header_PajeSubVariable (basic, size);
-  TRACE_header_PajeSetState (basic, size);
-  TRACE_header_PajePushState (basic, size);
-  TRACE_header_PajePopState (basic, size);
-  TRACE_header_PajeResetState (basic, size);
+  TRACE_header_PajeDefineContainerType (basic);
+  TRACE_header_PajeDefineVariableType (basic);
+  TRACE_header_PajeDefineStateType (basic);
+  TRACE_header_PajeDefineEventType (basic);
+  TRACE_header_PajeDefineLinkType (basic);
+  TRACE_header_PajeDefineEntityValue (basic);
+  TRACE_header_PajeCreateContainer ();
+  TRACE_header_PajeDestroyContainer ();
+  TRACE_header_PajeSetVariable ();
+  TRACE_header_PajeAddVariable ();
+  TRACE_header_PajeSubVariable ();
+  TRACE_header_PajeSetState ();
+  TRACE_header_PajePushState (size);
+  TRACE_header_PajePopState ();
+  TRACE_header_PajeResetState (basic);
   TRACE_header_PajeStartLink (basic, size);
-  TRACE_header_PajeEndLink (basic, size);
-  TRACE_header_PajeNewEvent (basic, size);
+  TRACE_header_PajeEndLink (basic);
+  TRACE_header_PajeNewEvent ();
 }