Merge branch 'clean_events' of github.com:Takishipp/simgrid into clean_events

diff --combined src/instr/instr_paje_trace.cpp
index 89e8397,825183e..2676cd1
--- 1/src/instr/instr_paje_trace.cpp
--- 2/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@@ -120,9 -120,9 +120,9 @@@ static void print_timestamp(PajeEvent* 
    /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
    if (event->timestamp < 1e-12)
      stream << 0;
-   else 
+   else
      stream << event->timestamp;
- }  
+ }
  
  /* internal do the instrumentation module */
  static void insert_into_buffer (PajeEvent* tbi)
@@@ -258,6 -258,9 +258,6 @@@ if (instr_fmt_type == instr_fmt_paje) 
  
  void LogStateTypeDefinition(type_t type)
  {
 -
 -  XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineStateType);
 -
    //print it
  if (instr_fmt_type == instr_fmt_paje) {
      XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineStateType, TRACE_precision(), 0.);
@@@ -322,6 -325,7 +322,6 @@@ void LogEntityValue (val_t value
    XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineEntityValue);
    //print it
  if (instr_fmt_type == instr_fmt_paje) {
 -    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineEntityValue, TRACE_precision(),0.);
      stream << std::fixed << std::setprecision(TRACE_precision());
      stream << PAJE_DefineEntityValue;
      stream << " " << value->id << " " << value->father->id << " " << value->name;
@@@ -343,6 -347,7 +343,6 @@@ void LogContainerCreation (container_t 
    XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, PAJE_CreateContainer,timestamp);
  
  if (instr_fmt_type == instr_fmt_paje) {
 -    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_CreateContainer, TRACE_precision(), timestamp);
      stream << std::fixed << std::setprecision(TRACE_precision());
      stream << PAJE_CreateContainer;
      stream << " ";
@@@ -394,6 -399,7 +394,6 @@@ void LogContainerDestruction(container_
    XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, PAJE_DestroyContainer, timestamp);
  
  if (instr_fmt_type == instr_fmt_paje) {
 -    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DestroyContainer, TRACE_precision(), timestamp);
      stream << std::fixed << std::setprecision(TRACE_precision());
      stream << PAJE_DestroyContainer;
      stream << " ";