Add event_new to s_type class as a method

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index 24b187f..15bfd80 100644 (file)
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -153,7 +153,7 @@ void TRACE_declare_mark(const char *mark_type)
   }
 
   XBT_DEBUG("MARK,declare %s", mark_type);
-  PJ_type_event_new(mark_type, PJ_type_get_root());
+  s_type::s_type_event_new(mark_type, PJ_type_get_root());
   declared_marks.insert(mark_type);
 }
 

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 01f0050..6656f99 100644 (file)
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -120,7 +120,7 @@ type_t s_type::s_type_container_new (const char *name, type_t father)
   return ret;
 }
 
-type_t PJ_type_event_new (const char *name, type_t father)
+type_t s_type::s_type_event_new (const char *name, type_t father)
 {
   if (name == nullptr){
     THROWF (tracing_error, 0, "can't create an event type with a nullptr name");

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index af35950..b0dd635 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -76,6 +76,7 @@ class s_type : public ess_type {
   s_type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father);
   static type_t s_type_get_or_null (const char *name, type_t father);
   static type_t s_type_container_new (const char *name, type_t father);
+  static type_t s_type_event_new (const char *name, type_t father);
 };
 
 //--------------------------------------------------
@@ -345,7 +346,6 @@ 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_PRIVATE type_t PJ_type_event_new (const char *name, type_t father);
 type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest);
 XBT_PRIVATE XBT_PRIVATE type_t PJ_type_variable_new (const char *name, const char *color, type_t father);
 XBT_PRIVATE type_t PJ_type_state_new (const char *name, type_t father);

diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp
index 31d70d5..c69f495 100644 (file)
--- a/src/smpi/colls/smpi_automatic_selector.cpp
+++ b/src/smpi/colls/smpi_automatic_selector.cpp
@@ -18,7 +18,7 @@
   if (TRACE_is_enabled()) {                                                                                            \
     type_t type = s_type::s_type_get_or_null(#cat, PJ_type_get_root());                                                       \
     if (not type) {                                                                                                    \
-      type = PJ_type_event_new(#cat, PJ_type_get_root());                                                              \
+      type = s_type::s_type_event_new(#cat, PJ_type_get_root());                                                              \
     }                                                                                                                  \
     char cont_name[25];                                                                                                \
     snprintf(cont_name, 25, "rank-%d", smpi_process()->index());                                                       \