[trace] new function to get the declared marks

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 7088976..f7eb843 100644 (file)
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -29,6 +29,7 @@ XBT_PUBLIC(void) TRACE_smpi_set_category(const char *category);
  */
 XBT_PUBLIC(void) TRACE_declare_mark(const char *mark_type);
 XBT_PUBLIC(void) TRACE_mark(const char *mark_type, const char *mark_value);
+XBT_PUBLIC(xbt_dynar_t) TRACE_get_marks (void);
 
 /*
  * Function used by graphicator (transform a SimGrid platform

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index e4f1114..534a374 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -79,6 +79,7 @@ int TRACE_start()
 
   /* other trace initialization */
   created_categories = xbt_dict_new_homogeneous(xbt_free);
+  declared_marks = xbt_dict_new_homogeneous (xbt_free);
   TRACE_surf_alloc();
   TRACE_smpi_alloc();
   return 0;

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 5532a6b..ba96831 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -20,6 +20,8 @@ typedef enum {
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
 
 xbt_dict_t created_categories = NULL;
+xbt_dict_t declared_marks = NULL;
+
 /** \ingroup TRACE_category
  *  \brief Declare a new category with a random color.
  *
@@ -144,6 +146,11 @@ void TRACE_declare_mark(const char *mark_type)
 
   if (!mark_type) return;
 
+  //check if mark_type is already declared
+  char *created = xbt_dict_get_or_null(declared_marks, mark_type);
+  if (created) return;
+  xbt_dict_set (declared_marks, mark_type, xbt_strdup("1"), NULL);
+
   XBT_DEBUG("MARK,declare %s", mark_type);
   PJ_type_event_new(mark_type, NULL, PJ_type_get_root());
 }
@@ -173,6 +180,10 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
 
   if (!mark_type || !mark_value) return;
 
+  //check if mark_type is already declared
+  char *created = xbt_dict_get_or_null(declared_marks, mark_type);
+  if (created) return;
+
   XBT_DEBUG("MARK %s %s", mark_type, mark_value);
   type_t type = PJ_type_get (mark_type, PJ_type_get_root());
   if (type == NULL){
@@ -185,6 +196,28 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
   new_pajeNewEvent (MSG_get_clock(), PJ_container_get_root(), type, value);
 }
 
+/** \ingroup TRACE_mark
+ *  \brief Get declared marks
+ *
+ * This function should be used to get marks that were already
+ * declared with #TRACE_declare_mark.
+ *
+ * \return A dynar with the declared marks, must be freed with xbt_dynar_free.
+ *
+ */
+xbt_dynar_t TRACE_get_marks (void)
+{
+  if (!TRACE_is_enabled()) return NULL;
+
+  xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
+  xbt_dict_cursor_t cursor = NULL;
+  char *name, *value;
+  xbt_dict_foreach(declared_marks, cursor, name, value) {
+    xbt_dynar_push_as (ret, char*, xbt_strdup(name));
+  }
+  return ret;
+}
+
 static void instr_user_variable(double time,
                          const char *resource,
                          const char *variable,

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 028a62f..9ddf97b 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -74,6 +74,7 @@ typedef struct s_container {
 }s_container_t;
 
 extern xbt_dict_t created_categories;
+extern xbt_dict_t declared_marks;
 extern double TRACE_last_timestamp_to_dump;
 
 /* from paje.c */