remove DefineContainerEvent

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index a633018..b520463 100644 (file)
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -212,23 +212,16 @@ void TRACE_paje_end() {
   XBT_DEBUG("Filename %s is closed", filename);
 }
 
-DefineContainerEvent::DefineContainerEvent(type_t type)
+void DefineContainerEvent(type_t type)
 {
-
-  event_type                            = PAJE_DefineContainerType;
-  timestamp                             = 0;
-  this->type = type;
+  e_event_type event_type                            = PAJE_DefineContainerType;
+  double timestamp                             = 0;
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event_type);
   //print it
-  print ();
-       delete this;
-}
-
-void DefineContainerEvent::print() {
-       if (instr_fmt_type == instr_fmt_paje) {
+  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 << (int)event_type;
                stream << " " << type->id
                                << " " << type->father->id
                                << " " << type->name;
@@ -238,9 +231,11 @@ void DefineContainerEvent::print() {
        } else {
                THROW_IMPOSSIBLE;
        }
+  //--
 }
 
 
+
 DefineVariableTypeEvent::DefineVariableTypeEvent(type_t type)
 {
   this->event_type                           = PAJE_DefineVariableType;

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index acb89e3..c4fb6cf 100644 (file)
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -130,7 +130,7 @@ type_t PJ_type_container_new (const char *name, type_t father)
 
   if(father){
     XBT_DEBUG("ContainerType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
-    new DefineContainerEvent(ret);
+    DefineContainerEvent(ret);
   }
   return ret;
 }

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 40726f1..f2a3594 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -123,17 +123,6 @@ class PajeEvent {
   virtual ~PajeEvent();
 };
 
-class DefineContainerEvent : public PajeEvent
-{
-  public:
-  type_t type;
-  void print() override;
-  DefineContainerEvent(type_t);
-};
-
-//--------------------------------------------------
-
-
 //--------------------------------------------------
 
 class DefineVariableTypeEvent : public PajeEvent 
@@ -477,4 +466,6 @@ extern instr_fmt_type_t instr_fmt_type;
 
 SG_END_DECL()
 
+void DefineContainerEvent(type_t type);
+
 #endif