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 f611d22..81ce04a 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -12,6 +12,7 @@
 #include "simgrid/instr.h"
 #include "simgrid_config.h"
 #include "src/internal_config.h"
+#include <map>
 #include <set>
 #include <string>
 
@@ -112,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_;
 };
 
 //--------------------------------------------------
@@ -175,7 +176,7 @@ class SetStateEvent : public PajeEvent  {
   private:
     Container* container;
     Type* type;
-    Value* val;
+    Value* value;
     const char* filename;
     int linenumber;
 
@@ -189,7 +190,7 @@ class PushStateEvent : public PajeEvent  {
   public:
     Container* container;
     Type* type;
-    Value* val;
+    Value* value;
     int size;
     const char* filename;
     int linenumber;
@@ -239,13 +240,14 @@ 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;
 };