kill a C type now that we have a class

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 21c36d7..84c6059 100644 (file)
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -192,7 +192,7 @@ void TRACE_paje_end() {
   XBT_DEBUG("Filename %s is closed", filename);
 }
 
-void DefineContainerEvent(type_t type)
+void DefineContainerEvent(Type* type)
 {
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineContainerType);
   //print it
@@ -210,9 +210,7 @@ void DefineContainerEvent(type_t type)
   //--
 }
 
-
-
-void LogVariableTypeDefinition(type_t type)
+void LogVariableTypeDefinition(Type* type)
 {
 
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineVariableType);
@@ -233,8 +231,7 @@ if (instr_fmt_type == instr_fmt_paje) {
   }
 }
 
-
-void LogStateTypeDefinition(type_t type)
+void LogStateTypeDefinition(Type* type)
 {
   //print it
 if (instr_fmt_type == instr_fmt_paje) {
@@ -250,8 +247,7 @@ if (instr_fmt_type == instr_fmt_paje) {
   }
 }
 
-
-void LogDefineEventType(type_t type)
+void LogDefineEventType(Type* type)
 {
   //print it
   if (instr_fmt_type == instr_fmt_paje) {
@@ -267,7 +263,7 @@ void LogDefineEventType(type_t type)
   }
 }
 
-void LogLinkTypeDefinition(type_t type, Type* source, Type* dest)
+void LogLinkTypeDefinition(Type* type, Type* source, Type* dest)
 {
   XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineLinkType);
   //print it

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 8981037..c5ccbfa 100644 (file)
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -15,7 +15,7 @@ void PJ_type_release ()
   rootType = nullptr;
 }
 
-type_t PJ_type_get_root ()
+Type* PJ_type_get_root()
 {
   return rootType;
 }
@@ -43,7 +43,7 @@ Type::Type (const char *typeNameBuff, const char *key, const char *color, e_enti
   }
 }
 
-void PJ_type_free (type_t type)
+void PJ_type_free(Type* type)
 {
   Value* val;
   char *value_name;
@@ -61,7 +61,7 @@ void PJ_type_free (type_t type)
   type = nullptr;
 }
 
-void recursiveDestroyType (type_t type)
+void recursiveDestroyType(Type* type)
 {
   XBT_DEBUG("recursiveDestroyType %s", type->name);
   xbt_dict_cursor_t cursor = nullptr;
@@ -73,7 +73,7 @@ void recursiveDestroyType (type_t type)
   PJ_type_free(type);
 }
 
-type_t PJ_type_get (const char *name, Type* father)
+Type* PJ_type_get(const char* name, Type* father)
 {
   Type* ret = Type::getOrNull (name, father);
   if (ret == nullptr){
@@ -82,7 +82,7 @@ type_t PJ_type_get (const char *name, Type* father)
   return ret;
 }
 
-type_t Type::getOrNull (const char *name, Type* father)
+Type* Type::getOrNull(const char* name, Type* father)
 {
   if (name == nullptr || father == nullptr){
     THROWF (tracing_error, 0, "can't get type with a nullptr name or from a nullptr father");
@@ -104,7 +104,7 @@ type_t Type::getOrNull (const char *name, Type* father)
   return ret;
 }
 
-type_t Type::containerNew (const char *name, Type* father)
+Type* Type::containerNew(const char* name, Type* father)
 {
   if (name == nullptr){
     THROWF (tracing_error, 0, "can't create a container type with a nullptr name");
@@ -120,7 +120,7 @@ type_t Type::containerNew (const char *name, Type* father)
   return ret;
 }
 
-type_t Type::eventNew (const char *name, Type* father)
+Type* Type::eventNew(const char* name, Type* father)
 {
   if (name == nullptr){
     THROWF (tracing_error, 0, "can't create an event type with a nullptr name");
@@ -132,7 +132,7 @@ type_t Type::eventNew (const char *name, Type* father)
   return ret;
 }
 
-type_t Type::variableNew (const char *name, const char *color, Type* father)
+Type* Type::variableNew(const char* name, const char* color, Type* father)
 {
   if (name == nullptr){
     THROWF (tracing_error, 0, "can't create a variable type with a nullptr name");
@@ -151,7 +151,7 @@ type_t Type::variableNew (const char *name, const char *color, Type* father)
   return ret;
 }
 
-type_t Type::linkNew (const char *name, Type* father, Type* source, Type* dest)
+Type* Type::linkNew(const char* name, Type* father, Type* source, Type* dest)
 {
   if (name == nullptr){
     THROWF (tracing_error, 0, "can't create a link type with a nullptr name");
@@ -168,7 +168,7 @@ type_t Type::linkNew (const char *name, Type* father, Type* source, Type* dest)
   return ret;
 }
 
-type_t Type::stateNew (const char *name, Type* father)
+Type* Type::stateNew(const char* name, Type* father)
 {
   if (name == nullptr){
     THROWF (tracing_error, 0, "can't create a state type with a nullptr name");

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 10a19df..bc9a49c 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -58,8 +58,6 @@ typedef enum {
 
 //--------------------------------------------------
 
-class Type;
-typedef Type* type_t;
 class Type {
 public:
   char *id;
@@ -70,13 +68,13 @@ public:
   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_t father);
-  static type_t getOrNull (const char *name, type_t father);
-  static type_t containerNew (const char *name, type_t father);
-  static type_t eventNew (const char *name, type_t father);
-  static type_t variableNew (const char *name, const char *color, type_t father);
-  static type_t linkNew (const char *name, type_t father, type_t source, type_t dest);
-  static type_t stateNew (const char *name, type_t father);
+  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);
+  static Type* eventNew(const char* name, Type* father);
+  static Type* variableNew(const char* name, const char* color, Type* father);
+  static Type* linkNew(const char* name, Type* father, Type* source, Type* dest);
+  static Type* stateNew(const char* name, Type* father);
 };
 
 //--------------------------------------------------
@@ -86,12 +84,12 @@ public:
   char* name;
   char* color;
 
-  type_t father;
+  Type* father;
   Value* ret;
-  Value(const char* name, const char* color, type_t father);
+  Value(const char* name, const char* color, Type* father);
   ~Value();
-  static Value* get_or_new(const char* name, const char* color, type_t father);
-  static Value* get(const char* name, type_t father);
+  static Value* get_or_new(const char* name, const char* color, Type* father);
+  static Value* get(const char* name, Type* father);
 };
 
 
@@ -116,7 +114,7 @@ class s_container {
   sg_netpoint_t netpoint;
   char *name;     /* Unique name of this container */
   char *id;       /* Unique id of this container */
-  type_t type;    /* Type 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;
@@ -138,16 +136,17 @@ class PajeEvent {
 class DefineVariableTypeEvent : public PajeEvent
 {
   public:
-  type_t type;
-   DefineVariableTypeEvent(type_t type);
-   void print() override;
+    Type* type;
+    DefineVariableTypeEvent(Type* type);
+    void print() override;
 };
 //--------------------------------------------------
 
 class DefineStateTypeEvent : public PajeEvent  {
-  type_t type;
-  public:
-  DefineStateTypeEvent(type_t type);
+  Type* type;
+
+public:
+  DefineStateTypeEvent(Type* type);
   void print() override;
 };
 
@@ -155,22 +154,22 @@ class DefineStateTypeEvent : public PajeEvent  {
 class SetVariableEvent : public PajeEvent  {
   private:
   container_t container;
-  type_t type;
+  Type* type;
   double value;
   public:
-  SetVariableEvent (double timestamp, container_t container, type_t type, double value);
-  void print() override;
+    SetVariableEvent(double timestamp, container_t container, Type* type, double value);
+    void print() override;
 };
 
 
 class AddVariableEvent:public PajeEvent {
   private:
   container_t container;
-  type_t type;
+  Type* type;
   double value;
   public:
-  AddVariableEvent (double timestamp, container_t container, type_t type, double value);
-  void print() override;
+    AddVariableEvent(double timestamp, container_t container, Type* type, double value);
+    void print() override;
 };
 
 //--------------------------------------------------
@@ -179,23 +178,23 @@ class AddVariableEvent:public PajeEvent {
 class SubVariableEvent : public PajeEvent  {
   private:
   container_t container;
-  type_t type;
+  Type* type;
   double value;
   public:
-  SubVariableEvent(double timestamp, container_t container, type_t type, double value);
-  void print() override;
+    SubVariableEvent(double timestamp, container_t container, Type* type, double value);
+    void print() override;
 };
 //--------------------------------------------------
 
 class SetStateEvent : public PajeEvent  {
   private:
   container_t container;
-  type_t type;
+  Type* type;
   Value* val;
   const char* filename;
   int linenumber;
   public:
-    SetStateEvent(double timestamp, container_t container, type_t type, Value* val);
+    SetStateEvent(double timestamp, container_t container, Type* type, Value* val);
     void print() override;
 };
 
@@ -203,73 +202,75 @@ class SetStateEvent : public PajeEvent  {
 class PushStateEvent : public PajeEvent  {
   public:
   container_t container;
-  type_t type;
+  Type* type;
   Value* val;
   int size;
   const char* filename;
   int linenumber;
   void* extra_;
   public:
-    PushStateEvent(double timestamp, container_t container, type_t type, Value* val);
-    PushStateEvent(double timestamp, container_t container, type_t type, Value* val, void* extra);
+    PushStateEvent(double timestamp, container_t container, Type* type, Value* val);
+    PushStateEvent(double timestamp, container_t container, Type* type, Value* val, void* extra);
     void print() override;
 };
 
 class PopStateEvent : public PajeEvent  {
   container_t container;
-  type_t type;
-  public:
-  PopStateEvent (double timestamp, container_t container, type_t type);
+  Type* type;
+
+public:
+  PopStateEvent(double timestamp, container_t container, Type* type);
   void print() override;
 };
 
 class ResetStateEvent : public PajeEvent  {
   container_t container;
-  type_t type;
-  public:
-  ResetStateEvent (double timestamp, container_t container, type_t type);
+  Type* type;
+
+public:
+  ResetStateEvent(double timestamp, container_t container, Type* type);
   void print() override;
 };
 
 class StartLinkEvent : public PajeEvent  {
   public:
   container_t container;
-  type_t type;
+  Type* type;
   container_t sourceContainer;
   char *value;
   char *key;
   int size;
   public:
     ~StartLinkEvent();
-    StartLinkEvent(double timestamp, container_t container, type_t type, container_t sourceContainer, const char* value,
+    StartLinkEvent(double timestamp, container_t container, Type* type, container_t sourceContainer, const char* value,
                    const char* key);
-    StartLinkEvent(double timestamp, container_t container, type_t type, container_t sourceContainer, const char* value,
+    StartLinkEvent(double timestamp, container_t container, Type* type, container_t sourceContainer, const char* value,
                    const char* key, int size);
     void print() override;
 };
 
 class EndLinkEvent : public PajeEvent  {
   container_t container;
-  type_t type;
+  Type* type;
   container_t destContainer;
   char *value;
   char *key;
   public:
-  EndLinkEvent (double timestamp, container_t container, type_t type, container_t destContainer,
-                                  const char *value, const char *key);
-  ~EndLinkEvent();
-  void print() override;
+    EndLinkEvent(double timestamp, container_t container, Type* type, container_t destContainer, const char* value,
+                 const char* key);
+    ~EndLinkEvent();
+    void print() override;
 };
 
 
 class NewEvent : public PajeEvent  {
   public:
   container_t container;
-  type_t type;
+  Type* type;
   Value* val;
 
 public:
-  NewEvent(double timestamp, container_t container, type_t type, Value* val);
+  NewEvent(double timestamp, container_t container, Type* type, Value* val);
   void print() override;
 
 };
@@ -349,12 +350,12 @@ XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
 
 /* instr_paje_types.c */
 XBT_PRIVATE void PJ_type_release ();
-XBT_PUBLIC(type_t)  PJ_type_get_root ();
-XBT_PUBLIC(type_t)  PJ_type_get (const char *name, const type_t father);
-XBT_PRIVATE XBT_PRIVATE void PJ_type_free (type_t type); 
+XBT_PUBLIC(Type*) PJ_type_get_root();
+XBT_PUBLIC(Type*) PJ_type_get(const char* name, Type* father);
+XBT_PRIVATE XBT_PRIVATE void PJ_type_free(Type* type);
 
 /* instr_config.c */
-XBT_PRIVATE void recursiveDestroyType (type_t type);
+XBT_PRIVATE void recursiveDestroyType(Type* type);
 
 XBT_PRIVATE void TRACE_TI_start();
 XBT_PRIVATE void TRACE_TI_end();
@@ -428,13 +429,13 @@ extern instr_fmt_type_t instr_fmt_type;
 
 SG_END_DECL()
 
-void DefineContainerEvent(type_t type);
-void LogVariableTypeDefinition(type_t type);
-void LogStateTypeDefinition(type_t type);
-void LogLinkTypeDefinition(type_t type, type_t source, type_t dest);
+void DefineContainerEvent(Type* type);
+void LogVariableTypeDefinition(Type* type);
+void LogStateTypeDefinition(Type* type);
+void LogLinkTypeDefinition(Type* type, Type* source, Type* dest);
 void LogEntityValue(Value* val);
 void LogContainerCreation (container_t container);
 void LogContainerDestruction (container_t container);
-void LogDefineEventType(type_t type);
+void LogDefineEventType(Type* type);
 
 #endif