Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp
index 44fcd00..d04a1f9 100644 (file)
--- a/src/instr/instr_paje_events.cpp
+++ b/src/instr/instr_paje_events.cpp
@@ -18,19 +18,23 @@ namespace instr {
 NewEvent::NewEvent(double timestamp, container_t container, Type* type, EntityValue* val)
     : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_NewEvent), val(val)
 {
-  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_);
+  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, timestamp_);
   insertIntoBuffer();
 }
 
-LinkEvent::LinkEvent(double timestamp, container_t container, Type* type, e_event_type event_type, container_t endpoint,
+LinkEvent::LinkEvent(container_t container, Type* type, e_event_type event_type, container_t endpoint,
                      std::string value, std::string key)
-    : LinkEvent(timestamp, container, type, event_type, endpoint, value, key, -1)
+    : LinkEvent(container, type, event_type, endpoint, value, key, -1)
 {
 }
 
-LinkEvent::LinkEvent(double timestamp, container_t container, Type* type, e_event_type event_type, container_t endpoint,
+LinkEvent::LinkEvent(container_t container, Type* type, e_event_type event_type, container_t endpoint,
                      std::string value, std::string key, int size)
-    : PajeEvent(container, type, timestamp, event_type), endpoint_(endpoint), value_(value), key_(key), size_(size)
+    : PajeEvent(container, type, SIMIX_get_clock(), event_type)
+    , endpoint_(endpoint)
+    , value_(value)
+    , key_(key)
+    , size_(size)
 {
   XBT_DEBUG("%s: event_type=%u, timestamp=%f, value:%s", __FUNCTION__, eventType_, timestamp_, value_.c_str());
   insertIntoBuffer();
@@ -39,18 +43,17 @@ LinkEvent::LinkEvent(double timestamp, container_t container, Type* type, e_even
 VariableEvent::VariableEvent(double timestamp, Container* container, Type* type, e_event_type event_type, double value)
     : PajeEvent::PajeEvent(container, type, timestamp, event_type), value(value)
 {
-  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_);
+  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, timestamp_);
   insertIntoBuffer();
 }
 
-StateEvent::StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value)
-    : StateEvent(timestamp, container, type, event_type, value, nullptr)
+StateEvent::StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value)
+    : StateEvent(container, type, event_type, value, nullptr)
 {
 }
 
-StateEvent::StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value,
-                       void* extra)
-    : PajeEvent::PajeEvent(container, type, timestamp, event_type), value(value), extra_(extra)
+StateEvent::StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value, void* extra)
+    : PajeEvent::PajeEvent(container, type, SIMIX_get_clock(), event_type), value(value), extra_(extra)
 {
 #if HAVE_SMPI
   if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
@@ -73,10 +76,10 @@ void NewEvent::print()
     return;
 
   if (timestamp_ < 1e-12)
-    stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId();
+    stream << eventType_ << " " << 0 << " ";
   else
-    stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId();
-  stream << " " << val->getId();
+    stream << eventType_ << " " << timestamp_ << " ";
+  stream << getType()->getId() << " " << getContainer()->getId() << " " << val->getId();
   XBT_DEBUG("Dump %s", stream.str().c_str());
   fprintf(tracing_file, "%s\n", stream.str().c_str());
 }
@@ -89,11 +92,11 @@ void LinkEvent::print()
   if (instr_fmt_type != instr_fmt_paje)
     return;
   if (timestamp_ < 1e-12)
-    stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId() << " " << value_;
+    stream << eventType_ << " " << 0 << " " << getType()->getId() << " " << getContainer()->getId();
   else
-    stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId() << " " << value_;
+    stream << eventType_ << " " << timestamp_ << " " << getType()->getId() << " " << getContainer()->getId();
 
-  stream << " " << endpoint_->getId() << " " << key_;
+  stream << " " << value_ << " " << endpoint_->getId() << " " << key_;
 
   if (TRACE_display_sizes()) {
     stream << " " << size_;
@@ -111,9 +114,10 @@ void VariableEvent::print()
     return;
 
   if (timestamp_ < 1e-12)
-    stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId() << " " << value;
+    stream << eventType_ << " " << 0 << " ";
   else
-    stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId() << " " << value;
+    stream << eventType_ << " " << timestamp_ << " ";
+  stream << getType()->getId() << " " << getContainer()->getId() << " " << value;
   XBT_DEBUG("Dump %s", stream.str().c_str());
   fprintf(tracing_file, "%s\n", stream.str().c_str());
 }
@@ -125,9 +129,9 @@ void StateEvent::print()
   XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_);
   if (instr_fmt_type == instr_fmt_paje) {
     if (timestamp_ < 1e-12)
-      stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId();
+      stream << eventType_ << " " << 0 << " " << getType()->getId() << " " << getContainer()->getId();
     else
-      stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId();
+      stream << eventType_ << " " << timestamp_ << " " << getType()->getId() << " " << getContainer()->getId();
 
     if (value != nullptr) // PAJE_PopState Event does not need to have a value
       stream << " " << value->getId();
@@ -161,12 +165,12 @@ void StateEvent::print()
     instr_extra_data extra = (instr_extra_data)extra_;
 
     // FIXME: dirty extract "rank-" from the name, as we want the bare process id here
-    if (container->getName().find("rank-") != 0)
-      stream << container->getName() << " ";
+    if (getContainer()->getName().find("rank-") != 0)
+      stream << getContainer()->getName() << " ";
     else
-      stream << container->getName().erase(0, 5) << " ";
+      stream << getContainer()->getName().erase(0, 5) << " ";
 
-    FILE* trace_file = tracing_files.at(container);
+    FILE* trace_file = tracing_files.at(getContainer());
 
     switch (extra->type) {
       case TRACING_INIT: