X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a49ad1ba999dd2379dfa2959c12dd5949510f6d..5d038603f775914afc8c6f35eff53f3682802f5b:/src/instr/instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 550e2b96e5..7dc439db45 100644
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -10,218 +10,29 @@
 
 #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;
 xbt_dict_t created_categories;
 
-int TRACE_start()
+void TRACE_category(const char *category)
 {
-  // tracing system must be:
-  //    - enabled (with --cfg=tracing:1)
-  //    - already configured (TRACE_global_init already called)
-  if (!(TRACE_is_enabled() && TRACE_is_configured())){
-    return 0;
-  }
-
-  /* open the trace file */
-  TRACE_paje_start();
-
-  /* activate trace */
-  TRACE_activate ();
-
-  /* base type hierarchy:
-   * --cfg=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");
-
-  /* type hierarchy for:
-   * --cfg=tracing/uncategorized
-   */
-  if (TRACE_uncategorized()){
-    pajeDefineVariableTypeWithColor("power_used", "HOST", "power_used", "0.5 0.5 0.5");
-    pajeDefineVariableTypeWithColor("bandwidth_used", "LINK", "bandwidth_used", "0.5 0.5 0.5");
-  }
-
-  /* type hierarchy for:
-   * --cfg=tracing/msg/process
-   * --cfg=tracing/msg/volume
-   */
-  if (TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()) {
-    //processes grouped by host
-    pajeDefineContainerType("PROCESS", "HOST", "PROCESS");
-  }
-
-  if (TRACE_msg_process_is_enabled()) {
-    pajeDefineStateType("category", "PROCESS", "category");
-    pajeDefineStateType("presence", "PROCESS", "presence");
-  }
-
-  if (TRACE_msg_volume_is_enabled()) {
-    pajeDefineLinkType("volume", "0", "PROCESS", "PROCESS", "volume");
-  }
-
-  /* type hierarchy for:
-   * --cfg=tracing/msg/task
-   */
-  if (TRACE_msg_task_is_enabled()) {
-    //tasks grouped by host
-    pajeDefineContainerType("TASK", "HOST", "TASK");
-    pajeDefineStateType("category", "TASK", "category");
-    pajeDefineStateType("presence", "TASK", "presence");
-  }
-
-  /* type hierarchy for
-   * --cfg=tracing/smpi
-   * --cfg=tracing/smpi/group
-   */
-  if (TRACE_smpi_is_enabled()) {
-    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;
-}
-
-int TRACE_end()
-{
-  if (!TRACE_is_active())
-    return 1;
-
-  /* close the trace file */
-  TRACE_paje_end();
-
-  /* generate uncategorized graph configuration for triva */
-  if (TRACE_get_triva_uncat_conf()){
-    TRACE_generate_triva_uncat_conf();
-  }
-
-  /* generate categorized graph configuration for triva */
-  if (TRACE_get_triva_cat_conf()){
-    TRACE_generate_triva_cat_conf();
-  }
-
-  /* activate trace */
-  TRACE_desactivate ();
-  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 (!TRACE_is_active())
-    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);
+  TRACE_category_with_color (category, NULL);
 }
 
-void TRACE_define_type(const char *type,
-                       const char *parent_type, int final)
+void TRACE_category_with_color (const char *category, const char *color)
 {
-  char *val_one = NULL;
   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 (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(defined_types, type, &val_one, xbt_free);
-}
+  xbt_assert1 (instr_platform_traced(),
+      "%s must be called after environment creation", __FUNCTION__);
 
-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 (!TRACE_is_active())
-    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 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
@@ -233,17 +44,26 @@ 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 (TRACE_platform_is_enabled())
-    pajeDefineVariableTypeWithColor(state, "LINK", state, final_color);
-  snprintf(state, 100, "p%s", category);
-  if (TRACE_platform_is_enabled())
-    pajeDefineVariableTypeWithColor(state, "HOST", state, final_color);
+  DEBUG2("CAT,declare %s, %s", category, final_color);
 
-  val_one = xbt_strdup("1");
-  xbt_dict_set(created_categories, category, &val_one, xbt_free);
-  return 0;
+//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");
+//  -  }
+
+  //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)
@@ -253,6 +73,7 @@ void TRACE_declare_mark(const char *mark_type)
   if (!mark_type)
     return;
 
+  DEBUG1("MARK,declare %s", mark_type);
   pajeDefineEventType(mark_type, "0", mark_type);
 }
 
@@ -263,7 +84,66 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
   if (!mark_type || !mark_value)
     return;
 
+  DEBUG2("MARK %s %s", mark_type, mark_value);
   pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
 }
 
+
+void TRACE_user_link_variable(double time, const char *resource,
+                              const char *variable,
+                              double value, const char *what)
+{
+  if (!TRACE_is_active())
+    return;
+
+  xbt_assert1 (instr_platform_traced(),
+      "%s must be called after environment creation", __FUNCTION__);
+
+  char valuestr[100];
+  snprintf(valuestr, 100, "%g", value);
+
+  if (strcmp(what, "declare") == 0) {
+    instr_new_user_link_variable_type (variable, NULL);
+  } else{
+    char *variable_id = instr_variable_type(variable, resource);
+    char *resource_id = instr_resource_type(resource);
+    if (strcmp(what, "set") == 0) {
+      pajeSetVariable(time, variable_id, resource_id, valuestr);
+    } else if (strcmp(what, "add") == 0) {
+      pajeAddVariable(time, variable_id, resource_id, valuestr);
+    } else if (strcmp(what, "sub") == 0) {
+      pajeSubVariable(time, variable_id, resource_id, valuestr);
+    }
+  }
+}
+
+void TRACE_user_host_variable(double time, const char *variable,
+                              double value, const char *what)
+{
+  if (!TRACE_is_active())
+    return;
+
+  xbt_assert1 (instr_platform_traced(),
+      "%s must be called after environment creation", __FUNCTION__);
+
+  char valuestr[100];
+  snprintf(valuestr, 100, "%g", value);
+
+  if (strcmp(what, "declare") == 0) {
+    instr_new_user_host_variable_type (variable, NULL);
+  } else{
+    char *host_name = MSG_host_self()->name;
+    char *variable_id = instr_variable_type(variable, host_name);
+    char *resource_id = instr_resource_type(host_name);
+    if (strcmp(what, "set") == 0) {
+      pajeSetVariable(time, variable_id, resource_id, valuestr);
+    } else if (strcmp(what, "add") == 0) {
+      pajeAddVariable(time, variable_id, resource_id, valuestr);
+    } else if (strcmp(what, "sub") == 0) {
+      pajeSubVariable(time, variable_id, resource_id, valuestr);
+    }
+  }
+}
+
+
 #endif /* HAVE_TRACING */