instr: fix a new/free mismatch, and small cleanups

[simgrid.git] / src / instr / instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 61cb077..2ecebc2 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -69,6 +69,7 @@ public:
   xbt_dict_t children_;
   xbt_dict_t values_; // valid for all types except variable and container
   Type(const char* typeNameBuff, const char* key, const char* color, e_entity_types kind, Type* father);
+  ~Type();
   static Type* getOrNull(const char* name, Type* father);
   static Type* containerNew(const char* name, Type* father);
   static Type* eventNew(const char* name, Type* father);
@@ -85,7 +86,6 @@ public:
   char* color_;
 
   Type* father_;
-  Value* ret_;
   Value(const char* name, const char* color, Type* father);
   ~Value();
   static Value* get_or_new(const char* name, const char* color, Type* father);
@@ -109,11 +109,14 @@ typedef enum {
 
 class Container {
 public:
+  Container(const char* name, simgrid::instr::e_container_types kind, Container* father);
+  virtual ~Container();
+
   sg_netpoint_t netpoint_;
   char* name_;             /* Unique name of this container */
   char* id_;               /* Unique id of this container */
   Type* type_;             /* Type of this container */
-  int level_;              /* Level in the hierarchy, root level is 0 */
+  int level_ = 0;          /* Level in the hierarchy, root level is 0 */
   e_container_types kind_; /* This container is of what kind */
   Container* father_;
   xbt_dict_t children_;
@@ -125,30 +128,10 @@ class PajeEvent {
     double timestamp_;
     e_event_type eventType_;
     virtual void print() = 0;
-    void* data;
     virtual ~PajeEvent();
 };
 
 //--------------------------------------------------
-
-class DefineVariableTypeEvent : public PajeEvent
-{
-  public:
-    Type* type;
-    DefineVariableTypeEvent(Type* type);
-    void print() override;
-};
-//--------------------------------------------------
-
-class DefineStateTypeEvent : public PajeEvent  {
-  Type* type;
-
-public:
-  DefineStateTypeEvent(Type* type);
-  void print() override;
-};
-
-
 class SetVariableEvent : public PajeEvent  {
   private:
     Container* container;
@@ -160,7 +143,6 @@ class SetVariableEvent : public PajeEvent  {
     void print() override;
 };
 
-
 class AddVariableEvent:public PajeEvent {
   private:
     Container* container;
@@ -171,7 +153,6 @@ class AddVariableEvent:public PajeEvent {
     AddVariableEvent(double timestamp, Container* container, Type* type, double value);
     void print() override;
 };
-
 //--------------------------------------------------
 
 
@@ -345,14 +326,10 @@ XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc();
 extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;
 extern XBT_PRIVATE std::set<std::string> trivaEdgeTypes;
 XBT_PRIVATE long long int instr_new_paje_id ();
-XBT_PRIVATE void PJ_container_alloc ();
-XBT_PRIVATE void PJ_container_release ();
-XBT_PUBLIC(container_t) PJ_container_new(const char* name, simgrid::instr::e_container_types kind, container_t father);
 XBT_PUBLIC(container_t) PJ_container_get (const char *name);
-XBT_PUBLIC(container_t) PJ_container_get_or_null (const char *name);
+XBT_PUBLIC(simgrid::instr::Container*) PJ_container_get_or_null(const char* name);
 XBT_PUBLIC(container_t) PJ_container_get_root ();
 XBT_PUBLIC(void) PJ_container_set_root (container_t root);
-XBT_PUBLIC(void) PJ_container_free (container_t container);
 XBT_PUBLIC(void) PJ_container_free_all (void);
 XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
 
@@ -360,11 +337,8 @@ XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
 XBT_PRIVATE void PJ_type_release ();
 XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get_root();
 XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get(const char* name, simgrid::instr::Type* father);
-XBT_PRIVATE XBT_PRIVATE void PJ_type_free(simgrid::instr::Type* type);
 
 /* instr_config.c */
-XBT_PRIVATE void recursiveDestroyType(simgrid::instr::Type* type);
-
 XBT_PRIVATE void TRACE_TI_start();
 XBT_PRIVATE void TRACE_TI_end();
 
@@ -437,7 +411,7 @@ extern instr_fmt_type_t instr_fmt_type;
 
 SG_END_DECL()
 
-void DefineContainerEvent(simgrid::instr::Type* type);
+void LogContainerTypeDefinition(simgrid::instr::Type* type);
 void LogVariableTypeDefinition(simgrid::instr::Type* type);
 void LogStateTypeDefinition(simgrid::instr::Type* type);
 void LogLinkTypeDefinition(simgrid::instr::Type* type, simgrid::instr::Type* source, simgrid::instr::Type* dest);