uniformize the function names

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

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 4a95ba3..3b3e272 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -107,16 +107,16 @@ 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_;
 };
 
 //--------------------------------------------------
@@ -125,85 +125,63 @@ 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:
-    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;
@@ -212,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;
@@ -269,17 +247,17 @@ 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()
 
@@ -437,7 +415,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);