Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index ea77f8b..81ce04a 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -12,7 +12,9 @@
 #include "simgrid/instr.h"
 #include "simgrid_config.h"
 #include "src/internal_config.h"
+#include <map>
 #include <set>
+#include <string>
 
 /* Need to define function drand48 for Windows */
 /* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */
@@ -69,7 +71,10 @@ 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);
-  static Type* getOrNull(const char* name, Type* father);
+  ~Type();
+  Type* getChild(const char* name);
+  Type* getChildOrNull(const char* name);
+
   static Type* containerNew(const char* name, Type* father);
   static Type* eventNew(const char* name, Type* father);
   static Type* variableNew(const char* name, const char* color, Type* father);
@@ -85,7 +90,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,17 +113,17 @@ typedef enum {
 
 class Container {
 public:
-  Container(const char* name, simgrid::instr::e_container_types kind, Container* father);
+  Container(std::string 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 */
+  std::string name_;       /* Unique name of this container */
+  std::string id_;         /* Unique id of this container */
   Type* type_;             /* Type of this container */
   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_;
+  std::map<std::string, Container*> children_;
 };
 
 //--------------------------------------------------
@@ -172,7 +176,7 @@ class SetStateEvent : public PajeEvent  {
   private:
     Container* container;
     Type* type;
-    Value* val;
+    Value* value;
     const char* filename;
     int linenumber;
 
@@ -186,7 +190,7 @@ class PushStateEvent : public PajeEvent  {
   public:
     Container* container;
     Type* type;
-    Value* val;
+    Value* value;
     int size;
     const char* filename;
     int linenumber;
@@ -217,34 +221,33 @@ public:
 };
 
 class StartLinkEvent : public PajeEvent  {
-  public:
-    Container* container;
-    Type* type;
-    Container* sourceContainer;
-    char* value;
-    char* key;
-    int size;
+  Container* container_;
+  Type* type_;
+  Container* sourceContainer_;
+  std::string value_;
+  std::string key_;
+  int size_;
 
-  public:
-    ~StartLinkEvent();
-    StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value,
-                   const char* key);
-    StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value,
-                   const char* key, int size);
-    void print() override;
+public:
+  StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value,
+                 const char* key);
+  StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value,
+                 const char* key, int size);
+  void print() override;
 };
 
 class EndLinkEvent : public PajeEvent  {
   Container* container;
   Type* type;
   Container* destContainer;
-  char *value;
-  char *key;
-  public:
-    EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, const char* value,
-                 const char* key);
-    ~EndLinkEvent();
-    void print() override;
+  std::string value;
+  std::string key;
+
+public:
+  EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, std::string value,
+               std::string key);
+  ~EndLinkEvent() = default;
+  void print() override;
 };
 
 
@@ -326,24 +329,17 @@ 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_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_all (void);
 XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
 
 /* instr_paje_types.c */
-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();