X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bda8ae4e84d39e914a5014eef27e0e42491c474..bc0e9c9ecdf8b93f139978e522433f0a9fdcdedd:/src/instr/instr_paje_trace.cpp

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 74f1c96395..8843d0989b 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -7,104 +7,61 @@
 #include "src/instr/instr_private.h"
 #include "xbt/virtu.h" /* sg_cmdline */
 #include <sstream>
+#include <vector>
 #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 void print_paje_debug(std::string functionName, paje_event_t event) {
+static std::stringstream stream;
+
+void buffer_debug(std::vector<PajeEvent*> *buf);
+void buffer_debug(std::vector<PajeEvent*> *buf) {
+  return;
+  XBT_DEBUG(">>>>>> Dump the state of the buffer. %zu events", buf->size());
+  for (auto event :*buf){
+    event->print();
+    XBT_DEBUG("%p %s", event, stream.str().c_str());
+    stream.str("");
+    stream.clear();
+  }
+  XBT_DEBUG("<<<<<<");
+}
+
+static void print_paje_debug(std::string functionName, PajeEvent* 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;
+static void init_stream(PajeEvent* 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());
+  XBT_DEBUG("Dump %s", stream.str().c_str());
+  stream.str("");
+  stream.clear();
 }
 
-static void print_timestamp(std::stringstream& stream, paje_event_t event) {
+static void print_timestamp(PajeEvent* 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);
-  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);
-  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);
-  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);
-  stream << " " << static_cast<T>(event->data)->type->id
-         << " " << static_cast<T>(event->data)->container->id
-         << " " << static_cast<T>(event->data)->value;
-         
-  print_row(stream);
-}
+}  
 
-void TRACE_paje_init(void) {
-  active_writer.print_DefineContainerType = print_pajeDefineContainerType;
-  active_writer.print_DefineVariableType  = print_pajeDefineVariableType;
-  active_writer.print_DefineStateType     = print_pajeDefineStateType;
-  active_writer.print_DefineEventType     = print_pajeDefineEventType;
-  active_writer.print_DefineLinkType      = print_pajeDefineLinkType;
-  active_writer.print_DefineEntityValue   = print_pajeDefineEntityValue;
-  active_writer.print_CreateContainer     = print_pajeCreateContainer;
-  active_writer.print_DestroyContainer    = print_pajeDestroyContainer;
-  active_writer.print_SetVariable         = print_pajeSetVariable;
-  active_writer.print_AddVariable         = print_pajeAddVariable;
-  active_writer.print_SubVariable         = print_pajeSubVariable;
-  active_writer.print_SetState            = print_pajeSetState;
-  active_writer.print_PushState           = print_pajePushState;
-  active_writer.print_PopState            = print_pajePopState;
-  active_writer.print_ResetState          = print_pajeResetState;
-  active_writer.print_StartLink           = print_pajeStartLink;
-  active_writer.print_EndLink             = print_pajeEndLink;
-  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,166 +88,226 @@ 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);
 }
 
-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);
+void DefineContainerEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  stream << " " << type->id
+         << " " << type->father->id
+         << " " << type->name;
+  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);
+void DefineVariableTypeEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+ init_stream(this);
+  stream << " " << type->id
+         << " " << type->father->id
+         << " " << type->name;
+  if (type->color)
+    stream << " \"" << 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);
+void DefineStateTypeEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  stream << " " << type->id
+         << " " << type->father->id
+         << " " << type->name;
+  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);
+void DefineEventTypeEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  stream << " " << type->id
+         << " " << type->father->id
+         << " " << type->name;
+  print_row();
 }
 
-void print_pajeDefineLinkType(paje_event_t event) {
-  print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = 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);
+void DefineLinkTypeEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream (this);
+  stream << " " << type->id 
+         << " " << type->father->id 
+         << " " << source->id 
+         << " " << dest->id 
+         << " " << type->name;
+  print_row();
 }
 
-void print_pajeDefineEntityValue (paje_event_t event) {
-  print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = 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);
+void DefineEntityValueEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  stream << " "   << value->id
+         << " "   << value->father->id
+         << " "   << value->name;
+  if(value->color)
+    stream << " \"" << 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);
-  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 << "\"";
+void CreateContainerEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  print_timestamp(this);
+  stream << " "   << container->id
+         << " "   << container->type->id
+         << " "   << container->father->id
+         << " \"" << 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);
-  stream << " "   << static_cast<createContainer_t>(event->data)->container->type->id
-         << " "   << static_cast<createContainer_t>(event->data)->container->id;
+void DestroyContainerEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  print_timestamp(this);
+  stream << " "   << container->type->id
+         << " "   << container->id;
 
-  print_row(stream);
+  print_row();
 }
 
-void print_pajeSetVariable(paje_event_t event) {
-  print_paje_debug(__FUNCTION__, event);
-  print_default_pajeVariable_row<setVariable_t>(event);
+void SetVariableEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  print_timestamp(this);
+  stream << " " << type->id
+         << " " << container->id
+         << " " << value;
+  print_row();
 }
 
-void print_pajeAddVariable(paje_event_t event) {
-  print_paje_debug(__FUNCTION__, event);
-  print_default_pajeVariable_row<addVariable_t>(event);
+void AddVariableEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  print_timestamp(this);
+  stream << " " << type->id
+         << " " << container->id
+         << " " << value;
+  print_row();
 }
 
-void print_pajeSubVariable(paje_event_t event) {
-  print_paje_debug(__FUNCTION__, event);
-  print_default_pajeVariable_row<subVariable_t>(event);
+void SubVariableEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  print_timestamp(this);
+  stream << " " << type->id
+         << " " << container->id
+         << " " << value;
+  print_row();
 }
 
-void print_pajeSetState(paje_event_t event) {
-  print_paje_debug(__FUNCTION__, event);
-
-  std::stringstream stream = print_default_pajeState_row<setState_t>(event);
-  stream << " " << static_cast<setState_t>(event->data)->value->id;
-  print_row(stream);
+void SetStateEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream(this);
+  print_timestamp(this);
+  stream << " " << type->id
+         << " " << container->id;
+  stream << " " <<value->id;
+#if HAVE_SMPI
+  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+    stream << " \"" << filename
+           << "\" " << 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);
-  stream << " " << static_cast<pushState_t>(event->data)->value->id;
+void PushStateEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+    init_stream(this);
+  print_timestamp(this);
+  stream << " " << type->id
+         << " " << container->id;
+  stream << " " <<value->id;
 
   if (TRACE_display_sizes()) {
     stream << " ";
-    if (static_cast<pushState_t>(event->data)->extra != NULL) {
-      stream << static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->send_size;
+    if (extra != nullptr) {
+      stream << static_cast<instr_extra_data>(extra)->send_size;
     }
     else {
       stream << 0;
     }
   }
-  print_row(stream);
-
-  if (static_cast<pushState_t>(event->data)->extra != NULL) {
-    if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->sendcounts != NULL)
-      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)
-      xbt_free(static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->recvcounts);
-    xbt_free(static_cast<pushState_t>(event->data)->extra);
+#if HAVE_SMPI
+  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+    stream << " \"" << filename
+           << "\" " << linenumber;
+  }
+#endif
+  print_row();
+
+  if (extra != nullptr) {
+    if (static_cast<instr_extra_data>(extra)->sendcounts != nullptr)
+      xbt_free(static_cast<instr_extra_data>(extra)->sendcounts);
+    if (static_cast<instr_extra_data>(extra)->recvcounts != nullptr)
+      xbt_free(static_cast<instr_extra_data>(extra)->recvcounts);
+    xbt_free(extra);
   }
 }
 
-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);
+void PopStateEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+    init_stream(this);
+  print_timestamp(this);
+  stream << " " << type->id
+         << " " << container->id;
+  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);
+void ResetStateEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+    init_stream(this);
+  print_timestamp(this);
+  stream << " " << type->id
+         << " " << container->id;
+  print_row();
 }
 
-void print_pajeStartLink(paje_event_t event) {
-  print_paje_debug(__FUNCTION__, event);
-  std::stringstream stream = print_default_pajeLink_row<startLink_t>(event);
-  stream << " " << static_cast<startLink_t>(event->data)->sourceContainer->id
-         << " " << static_cast<startLink_t>(event->data)->key;
+void StartLinkEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+    init_stream(this);
+  print_timestamp(this);
+  stream << " " <<type->id
+         << " " <<container->id
+         << " " <<value;
+  stream << " " << sourceContainer->id
+         << " " << key;
 
   if (TRACE_display_sizes()) {
-    stream << " " << static_cast<startLink_t>(event->data)->size;
+    stream << " " << 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);
-  stream << " " << static_cast<endLink_t>(event->data)->destContainer->id
-         << " " << static_cast<endLink_t>(event->data)->key;
-  print_row(stream);
+void EndLinkEvent::print() {
+  print_paje_debug(__FUNCTION__, this);
+    init_stream(this);
+  print_timestamp(this);
+  stream << " " <<type->id
+         << " " <<container->id
+         << " " <<value;
+  stream << " " << destContainer->id
+         << " " << key;
+  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);
-  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);
+void NewEvent::print () {
+  print_paje_debug(__FUNCTION__, this);
+  init_stream (this);
+  print_timestamp(this);
+  stream << " " << type->id
+         << " " << container->id
+         << " " << value->id;
+  print_row();
 }