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

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index c574f803f0..463cadf654 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -230,20 +230,17 @@ DefineContainerEvent::DefineContainerEvent(type_t type)
 }
 
 void DefineContainerEvent::print() {
-	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;
-	}
-
+  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;
+  }
 }
 
 
@@ -261,21 +258,19 @@ DefineVariableTypeEvent::DefineVariableTypeEvent(type_t type)
 }
 
 void DefineVariableTypeEvent::print() {
-	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;
-	}
+  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)
@@ -305,35 +300,31 @@ DefineEventTypeEvent::DefineEventTypeEvent(type_t type)
 
 
 void DefineStateTypeEvent::print() {
-	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;
-	}
+  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() {
-	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;
-	}
+  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)
@@ -351,21 +342,17 @@ DefineLinkTypeEvent::DefineLinkTypeEvent(type_t type, type_t source, type_t dest
 }
 
 void DefineLinkTypeEvent::print() {
-	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;
-	}
+  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)
@@ -382,21 +369,19 @@ DefineEntityValueEvent::DefineEntityValueEvent (val_t value)
 
 
 void DefineEntityValueEvent::print() {
-	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;
-	}
+  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)
@@ -411,47 +396,45 @@ CreateContainerEvent::CreateContainerEvent (container_t container)
 }
 
 void CreateContainerEvent::print() {
-	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 (not 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);
+  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 (not 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);
+      _mkdir(folder_name);
 #else
-			mkdir(folder_name, S_IRWXU | S_IRWXG | S_IRWXO);
+      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);
+      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);
 
-			xbt_free(folder_name);
-			xbt_free(filename);
-		}
+      xbt_free(folder_name);
+      xbt_free(filename);
+    }
 
-		xbt_dict_set(tracing_files, container->name, (void *) ti_unique_file, nullptr);
-	} else {
-		THROW_IMPOSSIBLE;
-	}
+    xbt_dict_set(tracing_files, container->name, (void*)ti_unique_file, nullptr);
+  } else {
+    THROW_IMPOSSIBLE;
+  }
 }
 
 DestroyContainerEvent::DestroyContainerEvent (container_t container)
@@ -466,21 +449,20 @@ DestroyContainerEvent::DestroyContainerEvent (container_t container)
 }
 
 void DestroyContainerEvent::print() {
-	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 (not 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);
+  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 (not 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;
         }
@@ -500,20 +482,18 @@ SetVariableEvent::SetVariableEvent (double timestamp, container_t container, typ
 }
 
 void SetVariableEvent::print() {
-	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;
-	}
+  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)
@@ -530,20 +510,18 @@ AddVariableEvent::AddVariableEvent (double timestamp, container_t container, typ
 }
 
 void AddVariableEvent::print() {
-	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;
-	}
+  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)
@@ -560,20 +538,18 @@ SubVariableEvent::SubVariableEvent (double timestamp, container_t container, typ
 }
 
 void SubVariableEvent::print() {
-	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;
-	}
+  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)
@@ -598,26 +574,24 @@ SetStateEvent::SetStateEvent (double timestamp, container_t container, type_t ty
 }
 
 void SetStateEvent::print() {
-	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 (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();
-	} else if (instr_fmt_type == instr_fmt_TI) {
-		/* Nothing to do */
-	} else {
-		THROW_IMPOSSIBLE;
-	}
+    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)
@@ -646,168 +620,165 @@ PushStateEvent::PushStateEvent (double timestamp, container_t container, type_t
  : PushStateEvent(timestamp, container, type, value, nullptr)
 {}
 void PushStateEvent::print() {
-	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 (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_);
-		}
-	} 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;
-	}
+    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;
+  }
 }
 
 
@@ -824,19 +795,18 @@ PopStateEvent::PopStateEvent (double timestamp, container_t container, type_t ty
 }
 
 void PopStateEvent::print() {
-	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;
-	}
+  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)
@@ -852,19 +822,18 @@ ResetStateEvent::ResetStateEvent (double timestamp, container_t container, type_
 }
 
 void ResetStateEvent::print() {
-	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;
-	}
+  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,
@@ -891,26 +860,23 @@ StartLinkEvent::StartLinkEvent (double timestamp, container_t container, type_t
 }
 
 void StartLinkEvent::print() {
-	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;
-	}
+  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,
@@ -931,22 +897,19 @@ EndLinkEvent::EndLinkEvent (double timestamp, container_t container, type_t type
 
 
 void EndLinkEvent::print() {
-	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;
-	}
+  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)
@@ -963,20 +926,18 @@ NewEvent::NewEvent (double timestamp, container_t container, type_t type, val_t
 }
 
 void NewEvent::print () {
-	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;
-	}
+  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;
+  }
 }