X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20551fb51e6144ee0c7942602e4c4a60477ddfc8..29a6449f96953b36d2741ce31e2d971ef33ddfb6:/src/instr/instr_paje_trace.cpp

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 74f1c96395..7172f7e3fd 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -8,79 +8,74 @@
 #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");
 
 extern FILE * tracing_file;
 extern s_instr_trace_writer_t active_writer;
 
+static std::stringstream stream;
+
 static void print_paje_debug(std::string functionName, paje_event_t event) {
   XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event->event_type, TRACE_precision(),
             event->timestamp);
 }
 
-template<typename T> static std::stringstream init_stream(paje_event_t event) {
-  std::stringstream stream;
+template<typename T> static void init_stream(paje_event_t event) {
   stream << std::fixed << std::setprecision(TRACE_precision());
   stream << (int) event->event_type;
-
-  return stream;
 }
 
-static void print_row(std::stringstream& stream) {
+static void print_row() {
   stream << std::endl;
   fprintf(tracing_file, "%s", stream.str().c_str());
+  stream.str("");
+  stream.clear();
 }
 
-static void print_timestamp(std::stringstream& stream, paje_event_t event) {
+static void print_timestamp(paje_event_t event) {
   stream << " ";
   /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
-  if (event->timestamp == 0) 
+  if (event->timestamp < 1e-12)
     stream << 0;
   else 
     stream << event->timestamp;
 }
 
-
-template<typename T> static std::stringstream print_default_pajeLink_row(paje_event_t& event) {
-  std::stringstream stream = init_stream<T>(event);
-  print_timestamp(stream, event);
+template<typename T> static void print_default_pajeLink_row(paje_event_t& event) {
+  init_stream<T>(event);
+  print_timestamp(event);
   stream << " " << static_cast<T>(event->data)->type->id
          << " " << static_cast<T>(event->data)->container->id
          << " " << static_cast<T>(event->data)->value;
-
-  return stream;
 }
 
-template<typename T> static std::stringstream print_default_pajeState_row(paje_event_t& event) {
-  std::stringstream stream = init_stream<T>(event);
-  print_timestamp(stream, event);
+template<typename T> static void print_default_pajeState_row(paje_event_t& event) {
+  init_stream<T>(event);
+  print_timestamp(event);
   stream << " " << static_cast<T>(event->data)->type->id
          << " " << static_cast<T>(event->data)->container->id;
-         
-  return stream;
 }
 
-template<typename T> static std::stringstream print_default_pajeType_row(paje_event_t& event) {
-  std::stringstream stream = init_stream<T>(event);
+template<typename T> static void print_default_pajeType_row(paje_event_t& event) {
+  init_stream<T>(event);
   stream << " " << static_cast<T>(event->data)->type->id
          << " " << static_cast<T>(event->data)->type->father->id
          << " " << static_cast<T>(event->data)->type->name;
-         
-  return stream;
 }
 
 template<typename T> static void print_default_pajeVariable_row(paje_event_t& event) {
-  std::stringstream stream = init_stream<T>(event);
-  print_timestamp(stream, event);
+  init_stream<T>(event);
+  print_timestamp(event);
   stream << " " << static_cast<T>(event->data)->type->id
          << " " << static_cast<T>(event->data)->container->id
          << " " << static_cast<T>(event->data)->value;
          
-  print_row(stream);
+  print_row();
 }
 
-void TRACE_paje_init(void) {
+void TRACE_paje_init() {
   active_writer.print_DefineContainerType = print_pajeDefineContainerType;
   active_writer.print_DefineVariableType  = print_pajeDefineVariableType;
   active_writer.print_DefineStateType     = print_pajeDefineStateType;
@@ -101,10 +96,10 @@ void TRACE_paje_init(void) {
   active_writer.print_NewEvent            = print_pajeNewEvent;
 }
 
-void TRACE_paje_start(void) {
+void TRACE_paje_start() {
   char *filename = TRACE_get_filename();
   tracing_file = fopen(filename, "w");
-  if (tracing_file == NULL){
+  if (tracing_file == nullptr){
     THROWF (system_error, 1, "Tracefile %s could not be opened for writing.", filename);
   }
 
@@ -131,7 +126,7 @@ void TRACE_paje_start(void) {
   TRACE_header(TRACE_basic(),TRACE_display_sizes());
 }
 
-void TRACE_paje_end(void) {
+void TRACE_paje_end() {
   fclose(tracing_file);
   char *filename = TRACE_get_filename();
   XBT_DEBUG("Filename %s is closed", filename);
@@ -139,70 +134,72 @@ void TRACE_paje_end(void) {
 
 void print_pajeDefineContainerType(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeType_row<defineContainerType_t>(event);
-  print_row(stream);
+  print_default_pajeType_row<defineContainerType_t>(event);
+  print_row();
 }
 
 void print_pajeDefineVariableType(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeType_row<defineVariableType_t>(event);
-  stream << " \"" << static_cast<defineVariableType_t>(event->data)->type->color << "\"";
-  print_row(stream);
+  print_default_pajeType_row<defineVariableType_t>(event);
+  if(static_cast<defineVariableType_t>(event->data)->type->color)
+    stream << " \"" << static_cast<defineVariableType_t>(event->data)->type->color << "\"";
+  print_row();
 }
 
 void print_pajeDefineStateType(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeType_row<defineStateType_t>(event);
-  print_row(stream);
+  print_default_pajeType_row<defineStateType_t>(event);
+  print_row();
 }
 
 void print_pajeDefineEventType(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeType_row<defineEventType_t>(event);
-  print_row(stream);
+  print_default_pajeType_row<defineEventType_t>(event);
+  print_row();
 }
 
 void print_pajeDefineLinkType(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = init_stream<defineLinkType_t>(event);
+  init_stream<defineLinkType_t>(event);
   stream << " " << static_cast<defineLinkType_t>(event->data)->type->id 
          << " " << static_cast<defineLinkType_t>(event->data)->type->father->id 
          << " " << static_cast<defineLinkType_t>(event->data)->source->id 
          << " " << static_cast<defineLinkType_t>(event->data)->dest->id 
          << " " << static_cast<defineLinkType_t>(event->data)->type->name;
-  print_row(stream);
+  print_row();
 }
 
 void print_pajeDefineEntityValue (paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = init_stream<defineEntityValue_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 << "\"";
-  print_row(stream);
+         << " "   << 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();
 }
 
 void print_pajeCreateContainer(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = init_stream<createContainer_t>(event);
-  print_timestamp(stream, event);
+  init_stream<createContainer_t>(event);
+  print_timestamp(event);
   stream << " "   << static_cast<createContainer_t>(event->data)->container->id
          << " "   << static_cast<createContainer_t>(event->data)->container->type->id
          << " "   << static_cast<createContainer_t>(event->data)->container->father->id
          << " \"" << static_cast<createContainer_t>(event->data)->container->name << "\"";
 
-  print_row(stream);
+  print_row();
 }
 
 void print_pajeDestroyContainer(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = init_stream<createContainer_t>(event);
-  print_timestamp(stream, event);
+  init_stream<createContainer_t>(event);
+  print_timestamp(event);
   stream << " "   << static_cast<createContainer_t>(event->data)->container->type->id
          << " "   << static_cast<createContainer_t>(event->data)->container->id;
 
-  print_row(stream);
+  print_row();
 }
 
 void print_pajeSetVariable(paje_event_t event) {
@@ -223,31 +220,43 @@ void print_pajeSubVariable(paje_event_t event) {
 void print_pajeSetState(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
 
-  std::stringstream stream = print_default_pajeState_row<setState_t>(event);
+  print_default_pajeState_row<setState_t>(event);
   stream << " " << static_cast<setState_t>(event->data)->value->id;
-  print_row(stream);
+#if HAVE_SMPI
+  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+    stream << " \"" << static_cast<setState_t>(event->data)->filename
+           << "\" " << static_cast<setState_t>(event->data)->linenumber;
+  }
+#endif
+  print_row();
 }
 
 void print_pajePushState(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeState_row<pushState_t>(event);
+  print_default_pajeState_row<pushState_t>(event);
   stream << " " << static_cast<pushState_t>(event->data)->value->id;
 
   if (TRACE_display_sizes()) {
     stream << " ";
-    if (static_cast<pushState_t>(event->data)->extra != NULL) {
+    if (static_cast<pushState_t>(event->data)->extra != nullptr) {
       stream << static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->send_size;
     }
     else {
       stream << 0;
     }
   }
-  print_row(stream);
+#if HAVE_SMPI
+  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+    stream << " \"" << static_cast<pushState_t>(event->data)->filename
+           << "\" " << static_cast<pushState_t>(event->data)->linenumber;
+  }
+#endif
+  print_row();
 
-  if (static_cast<pushState_t>(event->data)->extra != NULL) {
-    if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->sendcounts != NULL)
+  if (static_cast<pushState_t>(event->data)->extra != nullptr) {
+    if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->sendcounts != nullptr)
       xbt_free(static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->sendcounts);
-    if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->recvcounts != NULL)
+    if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->recvcounts != nullptr)
       xbt_free(static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->recvcounts);
     xbt_free(static_cast<pushState_t>(event->data)->extra);
   }
@@ -255,42 +264,42 @@ void print_pajePushState(paje_event_t event) {
 
 void print_pajePopState(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeState_row<popState_t>(event);
-  print_row(stream);
+  print_default_pajeState_row<popState_t>(event);
+  print_row();
 }
 
 void print_pajeResetState(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeState_row<resetState_t>(event);
-  print_row(stream);
+  print_default_pajeState_row<resetState_t>(event);
+  print_row();
 }
 
 void print_pajeStartLink(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeLink_row<startLink_t>(event);
+  print_default_pajeLink_row<startLink_t>(event);
   stream << " " << static_cast<startLink_t>(event->data)->sourceContainer->id
          << " " << static_cast<startLink_t>(event->data)->key;
 
   if (TRACE_display_sizes()) {
     stream << " " << static_cast<startLink_t>(event->data)->size;
   }
-  print_row(stream);
+  print_row();
 }
 
 void print_pajeEndLink(paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeLink_row<startLink_t>(event);
+  print_default_pajeLink_row<startLink_t>(event);
   stream << " " << static_cast<endLink_t>(event->data)->destContainer->id
          << " " << static_cast<endLink_t>(event->data)->key;
-  print_row(stream);
+  print_row();
 }
 
 void print_pajeNewEvent (paje_event_t event) {
   print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = init_stream<newEvent_t>(event);
-  print_timestamp(stream, event);
+  init_stream<newEvent_t>(event);
+  print_timestamp(event);
   stream << " " << static_cast<newEvent_t>(event->data)->type->id
          << " " << static_cast<newEvent_t>(event->data)->container->id
          << " " << static_cast<newEvent_t>(event->data)->value->id;
-  print_row(stream);
+  print_row();
 }