twitching and tweaking

diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp
index c456e9d..44fcd00 100644 (file)
--- a/src/instr/instr_paje_events.cpp
+++ b/src/instr/instr_paje_events.cpp
@@ -15,9 +15,11 @@ std::map<container_t, FILE*> tracing_files; // TI specific
 namespace simgrid {
 namespace instr {
 
-PajeEvent::~PajeEvent()
+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 not implemented for %p: event_type=%u, timestamp=%f", __FUNCTION__, this, eventType_, timestamp_);
+  XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_);
+  insertIntoBuffer();
 }
 
 LinkEvent::LinkEvent(double timestamp, container_t container, Type* type, e_event_type event_type, container_t endpoint,
@@ -62,6 +64,23 @@ StateEvent::StateEvent(double timestamp, Container* container, Type* type, e_eve
   insertIntoBuffer();
 };
 
+void NewEvent::print()
+{
+  std::stringstream stream;
+  stream << std::fixed << std::setprecision(TRACE_precision());
+  XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_);
+  if (instr_fmt_type != instr_fmt_paje)
+    return;
+
+  if (timestamp_ < 1e-12)
+    stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId();
+  else
+    stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId();
+  stream << " " << val->getId();
+  XBT_DEBUG("Dump %s", stream.str().c_str());
+  fprintf(tracing_file, "%s\n", stream.str().c_str());
+}
+
 void LinkEvent::print()
 {
   std::stringstream stream;
@@ -141,128 +160,116 @@ void StateEvent::print()
       return;
     instr_extra_data extra = (instr_extra_data)extra_;
 
-    char* process_id = nullptr;
     // FIXME: dirty extract "rank-" from the name, as we want the bare process id here
     if (container->getName().find("rank-") != 0)
-      process_id = xbt_strdup(container->getCname());
+      stream << container->getName() << " ";
     else
-      process_id = xbt_strdup(container->getCname() + 5);
+      stream << container->getName().erase(0, 5) << " ";
 
     FILE* trace_file = tracing_files.at(container);
 
     switch (extra->type) {
       case TRACING_INIT:
-        fprintf(trace_file, "%s init\n", process_id);
+        stream << "init";
         break;
       case TRACING_FINALIZE:
-        fprintf(trace_file, "%s finalize\n", process_id);
+        stream << "finalize";
         break;
       case TRACING_SEND:
-        fprintf(trace_file, "%s send %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1);
+        stream << "send " << extra->dst << " " << extra->send_size << " " << extra->datatype1;
         break;
       case TRACING_ISEND:
-        fprintf(trace_file, "%s Isend %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1);
+        stream << "Isend " << extra->dst << " " << extra->send_size << " " << extra->datatype1;
         break;
       case TRACING_RECV:
-        fprintf(trace_file, "%s recv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1);
+        stream << "recv " << extra->src << " " << extra->send_size << " " << extra->datatype1;
         break;
       case TRACING_IRECV:
-        fprintf(trace_file, "%s Irecv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1);
+        stream << "Irecv " << extra->src << " " << extra->send_size << " " << extra->datatype1;
         break;
       case TRACING_TEST:
-        fprintf(trace_file, "%s test\n", process_id);
+        stream << "test";
         break;
       case TRACING_WAIT:
-        fprintf(trace_file, "%s wait\n", process_id);
+        stream << "wait";
         break;
       case TRACING_WAITALL:
-        fprintf(trace_file, "%s waitAll\n", process_id);
+        stream << "waitAll";
         break;
       case TRACING_BARRIER:
-        fprintf(trace_file, "%s barrier\n", process_id);
+        stream << "barrier";
         break;
       case TRACING_BCAST: // rank bcast size (root) (datatype)
-        fprintf(trace_file, "%s bcast %d ", process_id, extra->send_size);
+        stream << "bcast " << extra->send_size;
         if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, "")))
-          fprintf(trace_file, "%d %s", extra->root, extra->datatype1);
-        fprintf(trace_file, "\n");
+          stream << " " << extra->root << " " << extra->datatype1;
         break;
       case TRACING_REDUCE: // rank reduce comm_size comp_size (root) (datatype)
-        fprintf(trace_file, "%s reduce %d %f ", process_id, extra->send_size, extra->comp_size);
+        stream << "reduce " << extra->send_size << " " << extra->comp_size;
         if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, "")))
-          fprintf(trace_file, "%d %s", extra->root, extra->datatype1);
-        fprintf(trace_file, "\n");
+          stream << " " << extra->root << " " << extra->datatype1;
         break;
       case TRACING_ALLREDUCE: // rank allreduce comm_size comp_size (datatype)
-        fprintf(trace_file, "%s allReduce %d %f %s\n", process_id, extra->send_size, extra->comp_size,
-                extra->datatype1);
+        stream << "allReduce " << extra->send_size << " " << extra->comp_size << " " << extra->datatype1;
         break;
       case TRACING_ALLTOALL: // rank alltoall send_size recv_size (sendtype) (recvtype)
-        fprintf(trace_file, "%s allToAll %d %d %s %s\n", process_id, extra->send_size, extra->recv_size,
-                extra->datatype1, extra->datatype2);
+        stream << "allToAll " << extra->send_size << " " << extra->recv_size << " " << extra->datatype1 << " ";
+        stream << extra->datatype2;
         break;
       case TRACING_ALLTOALLV: // rank alltoallv send_size [sendcounts] recv_size [recvcounts] (sendtype) (recvtype)
-        fprintf(trace_file, "%s allToAllV %d ", process_id, extra->send_size);
+        stream << "allToAllV " << extra->send_size << " ";
         for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->sendcounts[i]);
-        fprintf(trace_file, "%d ", extra->recv_size);
+          stream << extra->sendcounts[i] << " ";
+        stream << extra->recv_size << " ";
         for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->recvcounts[i]);
-        fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2);
+          stream << extra->recvcounts[i] << " ";
+        stream << extra->datatype1 << " " << extra->datatype2;
         break;
       case TRACING_GATHER: // rank gather send_size recv_size root (sendtype) (recvtype)
-        fprintf(trace_file, "%s gather %d %d %d %s %s\n", process_id, extra->send_size, extra->recv_size, extra->root,
-                extra->datatype1, extra->datatype2);
+        stream << "gather " << extra->send_size << " " << extra->recv_size << " " << extra->datatype1 << " ";
+        stream << extra->datatype2;
         break;
       case TRACING_ALLGATHERV: // rank allgatherv send_size [recvcounts] (sendtype) (recvtype)
-        fprintf(trace_file, "%s allGatherV %d ", process_id, extra->send_size);
+        stream << "allGatherV " << extra->send_size;
         for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->recvcounts[i]);
-        fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2);
+          stream << extra->recvcounts[i] << " ";
+        stream << extra->datatype1 << " " << extra->datatype2;
         break;
       case TRACING_REDUCE_SCATTER: // rank reducescatter [recvcounts] comp_size (sendtype)
-        fprintf(trace_file, "%s reduceScatter ", process_id);
+        stream << "reduceScatter ";
         for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->recvcounts[i]);
-        fprintf(trace_file, "%f %s\n", extra->comp_size, extra->datatype1);
+          stream << extra->recvcounts[i] << " ";
+        stream << extra->comp_size << " " << extra->datatype1;
         break;
       case TRACING_COMPUTING:
-        fprintf(trace_file, "%s compute %f\n", process_id, extra->comp_size);
+        stream << "compute " << extra->comp_size;
         break;
       case TRACING_SLEEPING:
-        fprintf(trace_file, "%s sleep %f\n", process_id, extra->sleep_duration);
+        stream << "sleep " << extra->sleep_duration;
         break;
       case TRACING_GATHERV: // rank gatherv send_size [recvcounts] root (sendtype) (recvtype)
-        fprintf(trace_file, "%s gatherV %d ", process_id, extra->send_size);
+        stream << "gatherV " << extra->send_size;
         for (int i = 0; i < extra->num_processes; i++)
-          fprintf(trace_file, "%d ", extra->recvcounts[i]);
-        fprintf(trace_file, "%d %s %s\n", extra->root, extra->datatype1, extra->datatype2);
+          stream << extra->recvcounts[i] << " ";
+        stream << extra->root << " " << extra->datatype1 << " " << extra->datatype2;
         break;
       case TRACING_ALLGATHER: // rank allgather sendcount recvcounts (sendtype) (recvtype)
-        fprintf(trace_file, "%s allGather %d %d %s %s", process_id, extra->send_size, extra->recv_size,
-                extra->datatype1, extra->datatype2);
+        stream << "allGather " << extra->send_size << " " << extra->recv_size << " " << extra->datatype1 << " ";
+        stream << extra->datatype2;
         break;
-      case TRACING_WAITANY:
-      case TRACING_SENDRECV:
-      case TRACING_SCATTER:
-      case TRACING_SCATTERV:
-      case TRACING_SCAN:
-      case TRACING_EXSCAN:
-      case TRACING_COMM_SIZE:
-      case TRACING_COMM_SPLIT:
-      case TRACING_COMM_DUP:
-      case TRACING_SSEND:
-      case TRACING_ISSEND:
       default:
+        /* Unimplemented calls are: WAITANY, SENDRECV, SCATTER, SCATTERV, SCAN, EXSCAN, COMM_SIZE, COMM_SPLIT, COMM_DUP,
+         * SSEND, and ISSEND.
+         */
         XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", value->getCname());
         break;
     }
+    fprintf(trace_file, "%s\n", stream.str().c_str());
 
     if (extra->recvcounts != nullptr)
       xbt_free(extra->recvcounts);
     if (extra->sendcounts != nullptr)
       xbt_free(extra->sendcounts);
-    xbt_free(process_id);
     xbt_free(extra);
 
   } else {

diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp
index ebdad78..768ac59 100644 (file)
--- a/src/instr/instr_paje_events.hpp
+++ b/src/instr/instr_paje_events.hpp
@@ -44,7 +44,7 @@ public:
   e_event_type eventType_;
   PajeEvent(Container* container, Type* type, double timestamp, e_event_type eventType)
       : container(container), type(type), timestamp_(timestamp), eventType_(eventType){};
-  virtual ~PajeEvent();
+  virtual ~PajeEvent() = default;
   virtual void print() = 0;
   void insertIntoBuffer();
 };

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 0e2c89c..c8a069a 100644 (file)
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -87,24 +87,6 @@ void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf)
   XBT_DEBUG("<<<<<<");
 }
 
-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(simgrid::instr::PajeEvent* event)
-{
-  stream << " ";
-  /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
-  if (event->timestamp_ < 1e-12)
-    stream << 0;
-  else
-    stream << event->timestamp_;
-}
-
 /* internal do the instrumentation module */
 void simgrid::instr::PajeEvent::insertIntoBuffer()
 {
@@ -171,29 +153,6 @@ void TRACE_paje_end() {
   XBT_DEBUG("Filename %s is closed", filename);
 }
 
-simgrid::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_);
-
-  insertIntoBuffer();
-}
-
-void simgrid::instr::NewEvent::print()
-{
-  if (instr_fmt_type == instr_fmt_paje) {
-    XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_);
-    stream << std::fixed << std::setprecision(TRACE_precision());
-    stream << eventType_;
-    print_timestamp(this);
-    stream << " " << type->getId() << " " << container->getId() << " " << val->getId();
-    print_row();
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    /* Nothing to do */
-  } else {
-    THROW_IMPOSSIBLE;
-  }
-}
 
 void TRACE_TI_start()
 {

diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp
index 5a18cc0..c8c7a4c 100644 (file)
--- a/src/instr/instr_paje_types.hpp
+++ b/src/instr/instr_paje_types.hpp
@@ -56,7 +56,7 @@ public:
 
 class ContainerType : public Type {
 public:
-  ContainerType(std::string name) : Type(name, name, "", nullptr){};
+  explicit ContainerType(std::string name) : Type(name, name, "", nullptr){};
   ContainerType(std::string name, Type* father);
 };