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

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 3e92c07ee4..54473aca6f 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -9,19 +9,27 @@
 #include "src/smpi/private.hpp"
 #include "typeinfo"
 #include "xbt/virtu.h" /* sg_cmdline */
+#include "simgrid/sg_config.h"
+
 #include <sstream>
 #include <vector>
 #include <iomanip> /** std::setprecision **/
-#include "simgrid/sg_config.h"
+#include <sys/stat.h>
+#ifdef WIN32
+#include <direct.h> // _mkdir
+#endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system");
 
-extern FILE * tracing_file;
 extern s_instr_trace_writer_t active_writer;
 
 static std::stringstream stream;
 FILE *tracing_file = nullptr;
 
+static xbt_dict_t tracing_files = nullptr; // TI specific
+static double prefix=0.0; // TI specific
+
+
 void print_NULL(PajeEvent* event){}
 
 /* The active set of functions for the selected trace format
@@ -219,13 +227,20 @@ DefineContainerEvent::DefineContainerEvent(type_t type)
 }
 
 void DefineContainerEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  stream << " " << type->id
-         << " " << type->father->id
-         << " " << type->name;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		stream << " " << type->id
+				<< " " << type->father->id
+				<< " " << type->name;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
+
 }
 
 
@@ -243,15 +258,21 @@ DefineVariableTypeEvent::DefineVariableTypeEvent(type_t type)
 }
 
 void DefineVariableTypeEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  stream << " " << type->id
-         << " " << type->father->id
-         << " " << type->name;
-  if (type->color)
-    stream << " \"" << type->color << "\"";
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		stream << " " << type->id
+				<< " " << type->father->id
+				<< " " << type->name;
+		if (type->color)
+			stream << " \"" << type->color << "\"";
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 DefineStateTypeEvent::DefineStateTypeEvent(type_t type)
@@ -281,23 +302,35 @@ DefineEventTypeEvent::DefineEventTypeEvent(type_t type)
 
 
 void DefineStateTypeEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  stream << " " << type->id
-         << " " << type->father->id
-         << " " << type->name;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		stream << " " << type->id
+				<< " " << type->father->id
+				<< " " << type->name;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 void DefineEventTypeEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  stream << " " << type->id
-         << " " << type->father->id
-         << " " << type->name;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		stream << " " << type->id
+				<< " " << type->father->id
+				<< " " << type->name;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 DefineLinkTypeEvent::DefineLinkTypeEvent(type_t type, type_t source, type_t dest)
@@ -315,15 +348,21 @@ DefineLinkTypeEvent::DefineLinkTypeEvent(type_t type, type_t source, type_t dest
 }
 
 void DefineLinkTypeEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  stream << " " << type->id 
-         << " " << type->father->id 
-         << " " << source->id 
-         << " " << dest->id 
-         << " " << type->name;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		stream << " " << type->id
+				<< " " << type->father->id
+				<< " " << source->id
+				<< " " << dest->id
+				<< " " << type->name;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 DefineEntityValueEvent::DefineEntityValueEvent (val_t value)
@@ -340,15 +379,21 @@ DefineEntityValueEvent::DefineEntityValueEvent (val_t value)
 
 
 void DefineEntityValueEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  stream << " "   << value->id
-         << " "   << value->father->id
-         << " "   << value->name;
-  if(value->color)
-    stream << " \"" << value->color << "\"";
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		stream << " "   << value->id
+				<< " "   << value->father->id
+				<< " "   << value->name;
+		if(value->color)
+			stream << " \"" << value->color << "\"";
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 CreateContainerEvent::CreateContainerEvent (container_t container)
@@ -359,21 +404,51 @@ CreateContainerEvent::CreateContainerEvent (container_t container)
 
   XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp);
 
-  //print it
   print();
 }
 
 void CreateContainerEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " "   << container->id
-         << " "   << container->type->id
-         << " "   << container->father->id
-         << " \"" << container->name << "\"";
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " "   << container->id
+				<< " "   << container->type->id
+				<< " "   << container->father->id
+				<< " \"" << container->name << "\"";
+
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		//if we are in the mode with only one file
+		static FILE *ti_unique_file = nullptr;
+
+		if (tracing_files == nullptr) {
+			tracing_files = xbt_dict_new_homogeneous(nullptr);
+			//generate unique run id with time
+			prefix = xbt_os_time();
+		}
+
+		if (!xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) {
+			char *folder_name = bprintf("%s_files", TRACE_get_filename());
+			char *filename = bprintf("%s/%f_%s.txt", folder_name, prefix, container->name);
+#ifdef WIN32
+			_mkdir(folder_name);
+#else
+			mkdir(folder_name, S_IRWXU | S_IRWXG | S_IRWXO);
+#endif
+			ti_unique_file = fopen(filename, "w");
+			xbt_assert(ti_unique_file, "Tracefile %s could not be opened for writing: %s", filename, strerror(errno));
+			fprintf(tracing_file, "%s\n", filename);
 
-  print_row();
+			xbt_free(folder_name);
+			xbt_free(filename);
+		}
+
+		xbt_dict_set(tracing_files, container->name, (void *) ti_unique_file, nullptr);
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 DestroyContainerEvent::DestroyContainerEvent (container_t container)
@@ -388,14 +463,24 @@ DestroyContainerEvent::DestroyContainerEvent (container_t container)
 }
 
 void DestroyContainerEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " "   << container->type->id
-         << " "   << container->id;
-
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " "   << container->type->id
+				<< " "   << container->id;
+
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		if (!xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file")|| xbt_dict_length(tracing_files) == 1) {
+			FILE* f = (FILE*)xbt_dict_get_or_null(tracing_files, container->name);
+			fclose(f);
+		}
+		xbt_dict_remove(tracing_files, container->name);
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 SetVariableEvent::SetVariableEvent (double timestamp, container_t container, type_t type, double value)
@@ -412,14 +497,20 @@ SetVariableEvent::SetVariableEvent (double timestamp, container_t container, typ
 }
 
 void SetVariableEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " << type->id
-         << " " << container->id
-         << " " << value;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " << type->id
+				<< " " << container->id
+				<< " " << value;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 AddVariableEvent::AddVariableEvent (double timestamp, container_t container, type_t type, double value)
@@ -436,14 +527,20 @@ AddVariableEvent::AddVariableEvent (double timestamp, container_t container, typ
 }
 
 void AddVariableEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " << type->id
-         << " " << container->id
-         << " " << value;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " << type->id
+				<< " " << container->id
+				<< " " << value;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 SubVariableEvent::SubVariableEvent (double timestamp, container_t container, type_t type, double value)
@@ -460,14 +557,20 @@ SubVariableEvent::SubVariableEvent (double timestamp, container_t container, typ
 }
 
 void SubVariableEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " << type->id
-         << " " << container->id
-         << " " << value;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " << type->id
+				<< " " << container->id
+				<< " " << value;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 SetStateEvent::SetStateEvent (double timestamp, container_t container, type_t type, val_t value)
@@ -492,20 +595,26 @@ SetStateEvent::SetStateEvent (double timestamp, container_t container, type_t ty
 }
 
 void SetStateEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " << type->id
-         << " " << container->id;
-  stream << " " <<value->id;
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		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;
-  }
+		if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+			stream << " \"" << filename
+					<< "\" " << linenumber;
+		}
 #endif
-  print_row();
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 PushStateEvent::PushStateEvent (double timestamp, container_t container, type_t type, val_t value, void* extra)
@@ -515,7 +624,7 @@ PushStateEvent::PushStateEvent (double timestamp, container_t container, type_t
   this->type = type;
   this->container = container;
   this->value     = value;
-  this->extra     = extra;
+  this->extra_     = extra;
 
 #if HAVE_SMPI
   if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
@@ -534,38 +643,168 @@ PushStateEvent::PushStateEvent (double timestamp, container_t container, type_t
  : PushStateEvent(timestamp, container, type, value, nullptr)
 {}
 void PushStateEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " << type->id
-         << " " << container->id;
-  stream << " " <<value->id;
-
-  if (TRACE_display_sizes()) {
-    stream << " ";
-    if (extra != nullptr) {
-      stream << static_cast<instr_extra_data>(extra)->send_size;
-    }
-    else {
-      stream << 0;
-    }
-  }
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " << type->id
+				<< " " << container->id;
+		stream << " " <<value->id;
+
+		if (TRACE_display_sizes()) {
+			stream << " ";
+			if (extra_ != nullptr) {
+				stream << static_cast<instr_extra_data>(extra_)->send_size;
+			}
+			else {
+				stream << 0;
+			}
+		}
 #if HAVE_SMPI
-  if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
-    stream << " \"" << filename
-           << "\" " << linenumber;
-  }
+		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);
-  }
+		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_);
+		}
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		  if (extra_ == nullptr)
+		    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 (strstr(container->name, "rank-") == nullptr)
+		    process_id = xbt_strdup(container->name);
+		  else
+		    process_id = xbt_strdup(container->name + 5);
+
+		  FILE* trace_file =  (FILE* )xbt_dict_get(tracing_files, container->name);
+
+		  switch (extra->type) {
+		  case TRACING_INIT:
+		    fprintf(trace_file, "%s init\n", process_id);
+		    break;
+		  case TRACING_FINALIZE:
+		    fprintf(trace_file, "%s finalize\n", process_id);
+		    break;
+		  case TRACING_SEND:
+		    fprintf(trace_file, "%s send %d %d %s\n", process_id, 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);
+		    break;
+		  case TRACING_RECV:
+		    fprintf(trace_file, "%s recv %d %d %s\n", process_id, 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);
+		    break;
+		  case TRACING_TEST:
+		    fprintf(trace_file, "%s test\n", process_id);
+		    break;
+		  case TRACING_WAIT:
+		    fprintf(trace_file, "%s wait\n", process_id);
+		    break;
+		  case TRACING_WAITALL:
+		    fprintf(trace_file, "%s waitAll\n", process_id);
+		    break;
+		  case TRACING_BARRIER:
+		    fprintf(trace_file, "%s barrier\n", process_id);
+		    break;
+		  case TRACING_BCAST:          // rank bcast size (root) (datatype)
+		    fprintf(trace_file, "%s bcast %d ", process_id, 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");
+		    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);
+		    if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, "")))
+		      fprintf(trace_file, "%d %s", extra->root, extra->datatype1);
+		    fprintf(trace_file, "\n");
+		    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);
+		    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);
+		    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);
+		    for (int i = 0; i < extra->num_processes; i++)
+		      fprintf(trace_file, "%d ", extra->sendcounts[i]);
+		    fprintf(trace_file, "%d ", 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);
+		    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);
+		    break;
+		  case TRACING_ALLGATHERV:     // rank allgatherv send_size [recvcounts] (sendtype) (recvtype)
+		    fprintf(trace_file, "%s allGatherV %d ", process_id, 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);
+		    break;
+		  case TRACING_REDUCE_SCATTER: // rank reducescatter [recvcounts] comp_size (sendtype)
+		    fprintf(trace_file, "%s reduceScatter ", process_id);
+		    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);
+		    break;
+		  case TRACING_COMPUTING:
+		    fprintf(trace_file, "%s compute %f\n", process_id, extra->comp_size);
+		    break;
+		  case TRACING_SLEEPING:
+		    fprintf(trace_file, "%s sleep %f\n", process_id, 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);
+		    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);
+		    break;
+		  case TRACING_WAITANY:
+		  case TRACING_SENDRECV:
+		  case TRACING_SCATTER:
+		  case TRACING_SCATTERV:
+		  case TRACING_ALLGATHER:
+		  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:
+		    XBT_WARN ("Call from %s impossible to translate into replay command : Not implemented (yet)",
+		         value->name);
+		    break;
+		  }
+
+		  if (extra->recvcounts != nullptr)
+		    xbt_free(extra->recvcounts);
+		  if (extra->sendcounts != nullptr)
+		    xbt_free(extra->sendcounts);
+		  xbt_free(process_id);
+		  xbt_free(extra);
+
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 
@@ -582,13 +821,19 @@ PopStateEvent::PopStateEvent (double timestamp, container_t container, type_t ty
 }
 
 void PopStateEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " << type->id
-         << " " << container->id;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " << type->id
+				<< " " << container->id;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 ResetStateEvent::ResetStateEvent (double timestamp, container_t container, type_t type)
@@ -604,13 +849,19 @@ ResetStateEvent::ResetStateEvent (double timestamp, container_t container, type_
 }
 
 void ResetStateEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " << type->id
-         << " " << container->id;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " << type->id
+				<< " " << container->id;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 StartLinkEvent::StartLinkEvent (double timestamp, container_t container,
@@ -637,20 +888,26 @@ StartLinkEvent::StartLinkEvent (double timestamp, container_t container, type_t
 }
 
 void StartLinkEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " <<type->id
-         << " " <<container->id
-         << " " <<value;
-  stream << " " << sourceContainer->id
-         << " " << key;
-
-  if (TRACE_display_sizes()) {
-    stream << " " << size;
-  }
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " <<type->id
+				<< " " <<container->id
+				<< " " <<value;
+		stream << " " << sourceContainer->id
+				<< " " << key;
+
+		if (TRACE_display_sizes()) {
+			stream << " " << size;
+		}
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 EndLinkEvent::EndLinkEvent (double timestamp, container_t container, type_t type, container_t destContainer,
@@ -671,16 +928,22 @@ EndLinkEvent::EndLinkEvent (double timestamp, container_t container, type_t type
 
 
 void EndLinkEvent::print() {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " <<type->id
-         << " " <<container->id
-         << " " <<value;
-  stream << " " << destContainer->id
-         << " " << key;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " <<type->id
+				<< " " <<container->id
+				<< " " <<value;
+		stream << " " << destContainer->id
+				<< " " << key;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
 }
 
 NewEvent::NewEvent (double timestamp, container_t container, type_t type, val_t value)
@@ -697,12 +960,44 @@ NewEvent::NewEvent (double timestamp, container_t container, type_t type, val_t
 }
 
 void NewEvent::print () {
-  XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
-  stream << std::fixed << std::setprecision(TRACE_precision());
-  stream << (int)this->event_type;
-  print_timestamp(this);
-  stream << " " << type->id
-         << " " << container->id
-         << " " << value->id;
-  print_row();
+	if (instr_fmt_type == instr_fmt_paje) {
+		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp);
+		stream << std::fixed << std::setprecision(TRACE_precision());
+		stream << (int)this->event_type;
+		print_timestamp(this);
+		stream << " " << type->id
+				<< " " << container->id
+				<< " " << value->id;
+		print_row();
+	} else if (instr_fmt_type == instr_fmt_TI) {
+		/* Nothing to do */
+	} else {
+		THROW_IMPOSSIBLE;
+	}
+}
+
+
+void TRACE_TI_start()
+{
+  char *filename = TRACE_get_filename();
+  tracing_file = fopen(filename, "w");
+  if (tracing_file == nullptr)
+    THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename);
+
+  XBT_DEBUG("Filename %s is open for writing", filename);
+
+  /* output one line comment */
+  dump_comment(TRACE_get_comment());
+
+  /* output comment file */
+  dump_comment_file(TRACE_get_comment_file());
 }
+
+void TRACE_TI_end()
+{
+  xbt_dict_free(&tracing_files);
+  fclose(tracing_file);
+  char *filename = TRACE_get_filename();
+  XBT_DEBUG("Filename %s is closed", filename);
+}
+