X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e697d0a3c14acfc95f73f509af52d1872a85b0c..269a0c0c0c78a2e995314fae27468e1179286b02:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 79335b965a..6d03b70991 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -14,8 +14,6 @@
 #include "src/internal_config.h"
 #include <set>
 
-SG_BEGIN_DECL()
-
 /* Need to define function drand48 for Windows */
 /* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */
 #ifdef _WIN32
@@ -62,14 +60,14 @@ typedef enum {
 
 class Type {
 public:
-  char *id;
-  char *name;
-  char *color;
-
-  e_entity_types kind;
-  Type *father;
-  xbt_dict_t children;
-  xbt_dict_t values; //valid for all types except variable and container
+  char* id_;
+  char* name_;
+  char* color_;
+
+  e_entity_types kind_;
+  Type* father_;
+  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);
   static Type* containerNew(const char* name, Type* father);
@@ -82,12 +80,12 @@ public:
 //--------------------------------------------------
 class Value {
 public:
-  char* id;
-  char* name;
-  char* color;
+  char* id_;
+  char* name_;
+  char* color_;
 
-  Type* father;
-  Value* ret;
+  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,103 +107,81 @@ typedef enum {
 
 //--------------------------------------------------
 
-class s_container {
-  public:
-  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 */
-  e_container_types kind; /* This container is of what kind */
-  s_container *father;
-  xbt_dict_t children;
+class Container {
+public:
+  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 */
+  e_container_types kind_; /* This container is of what kind */
+  Container* father_;
+  xbt_dict_t children_;
 };
 
 //--------------------------------------------------
 class PajeEvent {
   public:
-  double timestamp;
-  e_event_type event_type;
-  virtual void print() = 0;
-  void *data;
-  virtual ~PajeEvent();
+    double timestamp_;
+    e_event_type eventType_;
+    virtual void print() = 0;
+    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:
-    s_container* container;
+    Container* container;
     Type* type;
     double value;
 
   public:
-    SetVariableEvent(double timestamp, s_container* container, Type* type, double value);
+    SetVariableEvent(double timestamp, Container* container, Type* type, double value);
     void print() override;
 };
 
-
 class AddVariableEvent:public PajeEvent {
   private:
-    s_container* container;
+    Container* container;
     Type* type;
     double value;
 
   public:
-    AddVariableEvent(double timestamp, s_container* container, Type* type, double value);
+    AddVariableEvent(double timestamp, Container* container, Type* type, double value);
     void print() override;
 };
-
 //--------------------------------------------------
 
 
 class SubVariableEvent : public PajeEvent  {
   private:
-    s_container* container;
+    Container* container;
     Type* type;
     double value;
 
   public:
-    SubVariableEvent(double timestamp, s_container* container, Type* type, double value);
+    SubVariableEvent(double timestamp, Container* container, Type* type, double value);
     void print() override;
 };
 //--------------------------------------------------
 
 class SetStateEvent : public PajeEvent  {
   private:
-    s_container* container;
+    Container* container;
     Type* type;
     Value* val;
     const char* filename;
     int linenumber;
 
   public:
-    SetStateEvent(double timestamp, s_container* container, Type* type, Value* val);
+    SetStateEvent(double timestamp, Container* container, Type* type, Value* val);
     void print() override;
 };
 
 
 class PushStateEvent : public PajeEvent  {
   public:
-    s_container* container;
+    Container* container;
     Type* type;
     Value* val;
     int size;
@@ -214,55 +190,55 @@ class PushStateEvent : public PajeEvent  {
     void* extra_;
 
   public:
-    PushStateEvent(double timestamp, s_container* container, Type* type, Value* val);
-    PushStateEvent(double timestamp, s_container* container, Type* type, Value* val, void* extra);
+    PushStateEvent(double timestamp, Container* container, Type* type, Value* val);
+    PushStateEvent(double timestamp, Container* container, Type* type, Value* val, void* extra);
     void print() override;
 };
 
 class PopStateEvent : public PajeEvent  {
-  s_container* container;
+  Container* container;
   Type* type;
 
 public:
-  PopStateEvent(double timestamp, s_container* container, Type* type);
+  PopStateEvent(double timestamp, Container* container, Type* type);
   void print() override;
 };
 
 class ResetStateEvent : public PajeEvent  {
-  s_container* container;
+  Container* container;
   Type* type;
 
 public:
-  ResetStateEvent(double timestamp, s_container* container, Type* type);
+  ResetStateEvent(double timestamp, Container* container, Type* type);
   void print() override;
 };
 
 class StartLinkEvent : public PajeEvent  {
   public:
-    s_container* container;
+    Container* container;
     Type* type;
-    s_container* sourceContainer;
+    Container* sourceContainer;
     char* value;
     char* key;
     int size;
 
   public:
     ~StartLinkEvent();
-    StartLinkEvent(double timestamp, s_container* container, Type* type, s_container* sourceContainer,
-                   const char* value, const char* key);
-    StartLinkEvent(double timestamp, s_container* container, Type* type, s_container* sourceContainer,
-                   const char* value, const char* key, int size);
+    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  {
-  s_container* container;
+  Container* container;
   Type* type;
-  s_container* destContainer;
+  Container* destContainer;
   char *value;
   char *key;
   public:
-    EndLinkEvent(double timestamp, s_container* container, Type* type, s_container* destContainer, const char* value,
+    EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, const char* value,
                  const char* key);
     ~EndLinkEvent();
     void print() override;
@@ -271,17 +247,19 @@ class EndLinkEvent : public PajeEvent  {
 
 class NewEvent : public PajeEvent  {
   public:
-    s_container* container;
+    Container* container;
     Type* type;
     Value* val;
 
   public:
-    NewEvent(double timestamp, s_container* container, Type* type, Value* val);
+    NewEvent(double timestamp, Container* container, Type* type, Value* val);
     void print() override;
 };
 }
 } // namespace simgrid::instr
-typedef simgrid::instr::s_container* container_t;
+typedef simgrid::instr::Container* container_t;
+
+SG_BEGIN_DECL()
 
 extern XBT_PRIVATE std::set<std::string> created_categories;
 extern XBT_PRIVATE std::set<std::string> declared_marks;