From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 19 Jun 2017 12:20:00 +0000 (+0200)
Subject: Merge pull request #190 from Takishipp/clean_events
X-Git-Tag: v3.16~39^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/183a6118a95c570b0c66695505dab7dbebc0c7b3?hp=-c

Merge pull request #190 from Takishipp/clean_events

fix leak of memory caused by DefineEventTypeEvent call
---

183a6118a95c570b0c66695505dab7dbebc0c7b3
diff --combined src/instr/instr_paje_trace.cpp
index 5ef6fb4e31,3a1033dd49..651368514d
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@@ -217,16 -217,18 +217,16 @@@ void DefineContainerEvent(type_t type
    XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineContainerType);
    //print it
    if (instr_fmt_type == instr_fmt_paje) {
 -		XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineContainerType, TRACE_precision(), 0.);
 -		stream << std::fixed << std::setprecision(TRACE_precision());
 -		stream << PAJE_DefineContainerType;
 -		stream << " " << type->id
 -				<< " " << type->father->id
 -				<< " " << type->name;
 -		print_row();
 -	} else if (instr_fmt_type == instr_fmt_TI) {
 -		/* Nothing to do */
 -	} else {
 -		THROW_IMPOSSIBLE;
 -	}
 +    XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineContainerType, TRACE_precision(), 0.);
 +    stream << std::fixed << std::setprecision(TRACE_precision());
 +    stream << PAJE_DefineContainerType;
 +    stream << " " << type->id << " " << type->father->id << " " << type->name;
 +    print_row();
 +  } else if (instr_fmt_type == instr_fmt_TI) {
 +    /* Nothing to do */
 +  } else {
 +    THROW_IMPOSSIBLE;
 +  }
    //--
  }
  
@@@ -271,24 -273,13 +271,13 @@@ if (instr_fmt_type == instr_fmt_paje) 
  }
  
  
- DefineEventTypeEvent::DefineEventTypeEvent(type_t type)
+ void LogDefineEventType(type_t type)
  {
-   this->event_type                        = PAJE_DefineEventType;
-   this->timestamp                         = 0;
-   this->type = type;
- 
-   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event_type);
- 
    //print it
-   print();
- }
- 
- 
- 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);
+     XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineEventType, TRACE_precision(), 0.);
      stream << std::fixed << std::setprecision(TRACE_precision());
-     stream << (int)this->event_type;
+     stream << PAJE_DefineEventType;
      stream << " " << type->id << " " << type->father->id << " " << type->name;
      print_row();
    } else if (instr_fmt_type == instr_fmt_TI) {
@@@ -345,12 -336,12 +334,12 @@@ if (instr_fmt_type == instr_fmt_paje) 
      stream << PAJE_CreateContainer;
      stream << " ";
    /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
 -     if (timestamp < 1e-12)
 -         stream << 0;
 -      else 
 -         stream << timestamp;
 -         stream << " " << container->id << " " << container->type->id << " " << container->father->id << " \""
 -            << container->name << "\"";
 +    if (timestamp < 1e-12)
 +      stream << 0;
 +    else
 +      stream << timestamp;
 +    stream << " " << container->id << " " << container->type->id << " " << container->father->id << " \""
 +           << container->name << "\"";
  
      print_row();
    } else if (instr_fmt_type == instr_fmt_TI) {
@@@ -765,7 -756,7 +754,7 @@@ ResetStateEvent::ResetStateEvent (doubl
    XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp);
  
    insert_into_buffer (this);
 -	delete [] this;
 +  delete[] this;
  }
  
  void ResetStateEvent::print() {