X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41dd9405e023a6edd042bc02e5fd48c90aee5d56..7fc7124c05e03245515decbf6d54163d5990c2a6:/src/instr/instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index c134963d19..2b03005b2e 100644
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -10,210 +10,32 @@
 
 #include "instr/instr_private.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(tracing, "Tracing Interface");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
 
-static xbt_dict_t defined_types;
-static xbt_dict_t created_categories;
+xbt_dict_t created_categories;
 
-int TRACE_start()
+void TRACE_category(const char *category)
 {
-  if (!TRACE_is_configured()) {
-    THROW0(tracing_error, TRACE_ERROR_START,
-           "TRACE_start should be called after SimGrid initialization functions.");
-    return 0;
-  }
-
-  if (!TRACE_is_enabled()){
-    return 0;
-  }
-
-  if (IS_TRACING) {             /* what? trace is already active... ignore.. */
-    THROW0(tracing_error, TRACE_ERROR_START,
-           "TRACE_start called, but tracing is already active.");
-    return 0;
-  }
-
-  char *filename = TRACE_get_filename();
-  if (!filename) {
-    THROW0(tracing_error, TRACE_ERROR_START,
-           "Trace filename is not initialized.");
-    return 0;
-  }
-  FILE *file = fopen(filename, "w");
-  if (!file) {
-    THROW1(tracing_error, TRACE_ERROR_START,
-           "Tracefile %s could not be opened for writing.", filename);
-  } else {
-    TRACE_paje_start(file);
-  }
-  TRACE_paje_create_header();
-
-  /* define paje hierarchy for tracing */
-  pajeDefineContainerType("PLATFORM", "0", "platform");
-  pajeDefineContainerType("HOST", "PLATFORM", "HOST");
-  pajeDefineContainerType("LINK", "PLATFORM", "LINK");
-  pajeDefineVariableType("power", "HOST", "power");
-  pajeDefineVariableType("bandwidth", "LINK", "bandwidth");
-  pajeDefineVariableType("latency", "LINK", "latency");
-  pajeDefineEventType("source", "LINK", "source");
-  pajeDefineEventType("destination", "LINK", "destination");
-
-  if (IS_TRACING_PLATFORM) {
-    if (TRACE_uncategorized()){
-      pajeDefineVariableType("power_used", "HOST", "power_used");
-      pajeDefineVariableType("bandwidth_used", "LINK", "bandwidth_used");
-    }
-  }
-
-  if (IS_TRACING_PROCESSES || IS_TRACING_VOLUME) {
-    //processes grouped by host
-    pajeDefineContainerType("PROCESS", "HOST", "PROCESS");
-  }
-
-  if (IS_TRACING_PROCESSES) {
-    pajeDefineStateType("category", "PROCESS", "category");
-    pajeDefineStateType("presence", "PROCESS", "presence");
-  }
-
-  if (IS_TRACING_VOLUME) {
-    pajeDefineLinkType("volume", "0", "PROCESS", "PROCESS", "volume");
-  }
-
-  if (IS_TRACING_TASKS) {
-    //tasks grouped by host
-    pajeDefineContainerType("TASK", "HOST", "TASK");
-    pajeDefineStateType("category", "TASK", "category");
-    pajeDefineStateType("presence", "TASK", "presence");
-  }
-
-  if (IS_TRACING_SMPI) {
-    if (TRACE_smpi_is_grouped()){
-      pajeDefineContainerType("MPI_PROCESS", "HOST", "MPI_PROCESS");
-    }else{
-      pajeDefineContainerType("MPI_PROCESS", "PLATFORM", "MPI_PROCESS");
-    }
-    pajeDefineStateType("MPI_STATE", "MPI_PROCESS", "MPI_STATE");
-    pajeDefineLinkType("MPI_LINK", "0", "MPI_PROCESS", "MPI_PROCESS",
-                       "MPI_LINK");
-  }
-
-  /* creating the platform */
-  pajeCreateContainer(MSG_get_clock(), "platform", "PLATFORM", "0",
-                      "simgrid-platform");
-
-  /* other trace initialization */
-  defined_types = xbt_dict_new();
-  created_categories = xbt_dict_new();
-  TRACE_msg_task_alloc();
-  TRACE_category_alloc();
-  TRACE_surf_alloc();
-  TRACE_msg_process_alloc();
-  TRACE_smpi_alloc();
-
-  return 0;
+  TRACE_category_with_color (category, NULL);
 }
 
-int TRACE_end()
+void TRACE_category_with_color (const char *category, const char *color)
 {
-  FILE *file = NULL;
-  if (!IS_TRACING)
-    return 1;
-  file = TRACE_paje_end();
-  fclose(file);
-  return 0;
-}
-
-int TRACE_category(const char *category)
-{
-  return TRACE_category_with_color (category, NULL);
-}
-
-int TRACE_category_with_color (const char *category, const char *color)
-{
-  static int first_time = 1;
-  if (!IS_TRACING)
-    return 1;
-
-  if (first_time) {
-    TRACE_define_type("user_type", "0", 1);
-    first_time = 0;
-  }
-  return TRACE_create_category_with_color(category, "user_type", "0", color);
-}
-
-void TRACE_define_type(const char *type,
-                       const char *parent_type, int final)
-{
-  char *val_one = NULL;
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
-
-  //check if type is already defined
-  if (xbt_dict_get_or_null(defined_types, type)) {
-    THROW1(tracing_error, TRACE_ERROR_TYPE_ALREADY_DEFINED,
-           "Type %s is already defined", type);
-  }
-  //check if parent_type is already defined
-  if (strcmp(parent_type, "0")
-      && !xbt_dict_get_or_null(defined_types, parent_type)) {
-    THROW1(tracing_error, TRACE_ERROR_TYPE_NOT_DEFINED,
-           "Type (used as parent) %s is not defined", parent_type);
-  }
-
-  pajeDefineContainerType(type, parent_type, type);
-  if (final) {
-    //for m_process_t
-    if (IS_TRACING_PROCESSES)
-      pajeDefineContainerType("process", type, "process");
-    if (IS_TRACING_PROCESSES)
-      pajeDefineStateType("process-state", "process", "process-state");
-
-    if (IS_TRACING_TASKS)
-      pajeDefineContainerType("task", type, "task");
-    if (IS_TRACING_TASKS)
-      pajeDefineStateType("task-state", "task", "task-state");
-  }
-  val_one = xbt_strdup("1");
-  xbt_dict_set(defined_types, type, &val_one, xbt_free);
-}
-
-int TRACE_create_category(const char *category,
-                          const char *type, const char *parent_category)
-{
-  return TRACE_create_category_with_color (category, type, parent_category, NULL);
-}
-
-int TRACE_create_category_with_color(const char *category,
-                          const char *type,
-                          const char *parent_category,
-                          const char *color)
-{
-  char state[100];
-  char *val_one = NULL;
-  if (!IS_TRACING)
-    return 1;
-
-  //check if type is defined
-  if (!xbt_dict_get_or_null(defined_types, type)) {
-    THROW1(tracing_error, TRACE_ERROR_TYPE_NOT_DEFINED,
-           "Type %s is not defined", type);
-    return 1;
-  }
-  //check if parent_category exists
-  if (strcmp(parent_category, "0")
-      && !xbt_dict_get_or_null(created_categories, parent_category)) {
-    THROW1(tracing_error, TRACE_ERROR_CATEGORY_NOT_DEFINED,
-           "Category (used as parent) %s is not created", parent_category);
-    return 1;
-  }
-  //check if category is created
-  if (xbt_dict_get_or_null(created_categories, category)) {
-    return 1;
-  }
-
-  pajeCreateContainer(MSG_get_clock(), category, type, parent_category,
-                      category);
-
+//
+//  {
+//    //check if hosts have been created
+//    xbt_assert1 (allHostTypes != NULL && xbt_dict_length(allHostTypes) != 0,
+//        "%s must be called after environment creation", __FUNCTION__);
+//  }
+
+  //check if category is already created
+  char *created = xbt_dict_get_or_null(created_categories, category);
+  if (created) return;
+  xbt_dict_set (created_categories, category, xbt_strdup("1"), xbt_free);
+
+  //define final_color
   char final_color[INSTR_DEFAULT_STR_SIZE];
   if (!color){
     //generate a random color
@@ -225,36 +47,47 @@ int TRACE_create_category_with_color(const char *category,
     snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
   }
 
-  /* for registering application categories on top of platform */
-  snprintf(state, 100, "b%s", category);
-  if (IS_TRACING_PLATFORM)
-    pajeDefineVariableTypeWithColor(state, "LINK", state, final_color);
-  snprintf(state, 100, "p%s", category);
-  if (IS_TRACING_PLATFORM)
-    pajeDefineVariableTypeWithColor(state, "HOST", state, final_color);
+  DEBUG2("CAT,declare %s, %s", category, final_color);
+
+//FIXME
+//  -  if (final) {
+//  -    //for m_process_t
+//  -    if (TRACE_msg_process_is_enabled())
+//  -      pajeDefineContainerType("process", type, "process");
+//  -    if (TRACE_msg_process_is_enabled())
+//  -      pajeDefineStateType("process-state", "process", "process-state");
+//  -
+//  -    if (TRACE_msg_task_is_enabled())
+//  -      pajeDefineContainerType("task", type, "task");
+//  -    if (TRACE_msg_task_is_enabled())
+//  -      pajeDefineStateType("task-state", "task", "task-state");
+//  -  }
 
-  val_one = xbt_strdup("1");
-  xbt_dict_set(created_categories, category, &val_one, xbt_free);
-  return 0;
+  //define the type of this category on top of hosts and links
+  if (TRACE_categorized ()){
+    instr_new_user_variable_type (category, final_color);
+  }
 }
 
 void TRACE_declare_mark(const char *mark_type)
 {
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
   if (!mark_type)
     return;
 
+  DEBUG1("MARK,declare %s", mark_type);
   pajeDefineEventType(mark_type, "0", mark_type);
 }
 
 void TRACE_mark(const char *mark_type, const char *mark_value)
 {
-  if (!IS_TRACING)
+  if (!TRACE_is_active())
     return;
   if (!mark_type || !mark_value)
     return;
 
+  DEBUG2("MARK %s %s", mark_type, mark_value);
   pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
 }