X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a6333fc8e440799c9feb7d800c73a2f478c07c8..15af6f9bf88ff4bfdd0b8e87039e666ee092fbfe:/src/instr/instr_paje_trace.cpp

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index cbdc9f9930..d106f33719 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -8,6 +8,7 @@
 #include "xbt/virtu.h" /* sg_cmdline */
 #include <sstream>
 #include <iomanip> /** std::setprecision **/
+#include "simgrid/sg_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr_trace, "tracing event system");
 
@@ -141,7 +142,8 @@ void print_pajeDefineContainerType(paje_event_t event) {
 void print_pajeDefineVariableType(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
   print_default_pajeType_row<defineVariableType_t>(event);
-  stream << " \"" << static_cast<defineVariableType_t>(event->data)->type->color << "\"";
+  if(static_cast<defineVariableType_t>(event->data)->type->color)
+    stream << " \"" << static_cast<defineVariableType_t>(event->data)->type->color << "\"";
   print_row();
 }
 
@@ -173,8 +175,9 @@ void print_pajeDefineEntityValue (paje_event_t event) {
   init_stream<defineEntityValue_t>(event);
   stream << " "   << static_cast<defineEntityValue_t>(event->data)->value->id
          << " "   << static_cast<defineEntityValue_t>(event->data)->value->father->id
-         << " "   << static_cast<defineEntityValue_t>(event->data)->value->name
-         << " \"" << static_cast<defineEntityValue_t>(event->data)->value->color << "\"";
+         << " "   << static_cast<defineEntityValue_t>(event->data)->value->name;
+  if(static_cast<defineEntityValue_t>(event->data)->value->color)
+    stream << " \"" << static_cast<defineEntityValue_t>(event->data)->value->color << "\"";
   print_row();
 }
 
@@ -220,6 +223,12 @@ void print_pajeSetState(paje_event_t event) {
 
   print_default_pajeState_row<setState_t>(event);
   stream << " " << static_cast<setState_t>(event->data)->value->id;
+
+  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+    stream << " \"" << static_cast<setState_t>(event->data)->filename
+           << "\" " << static_cast<setState_t>(event->data)->linenumber;
+  }
+
   print_row();
 }
 
@@ -237,6 +246,12 @@ void print_pajePushState(paje_event_t event) {
       stream << 0;
     }
   }
+
+  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+    stream << " \"" << static_cast<pushState_t>(event->data)->filename
+           << "\" " << static_cast<pushState_t>(event->data)->linenumber;
+  }
+
   print_row();
 
   if (static_cast<pushState_t>(event->data)->extra != NULL) {