X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c3db4bc680e606d91d4006265d7bcf9174df050..eb9843bb5d46f053935c36f741d37f21520c1e96:/src/instr/instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index a2aad01663..4472a8285b 100644
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -9,259 +9,289 @@
 #ifdef HAVE_TRACING
 
 #include "instr/instr_private.h"
+#include "surf/network_private.h"
+
+typedef enum {
+  INSTR_US_DECLARE,
+  INSTR_US_SET,
+  INSTR_US_ADD,
+  INSTR_US_SUB
+} InstrUserVariable;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
 
-static xbt_dict_t defined_types;
-xbt_dict_t created_categories;
+void TRACE_category(const char *category)
+{
+  TRACE_category_with_color (category, NULL);
+}
 
-int TRACE_start()
+void TRACE_category_with_color (const char *category, const char *color)
 {
-  // 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;
-  }
+  /* safe switch */
+  if (!TRACE_is_enabled()) return;
 
-  DEBUG0("Tracing starts");
-
-  /* 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");
-  }
+  if (!(TRACE_categorized() && category != NULL)) return;
 
-  /* 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 platform is not traced, we can't deal with categories */
+  if (!TRACE_needs_platform()) return;
 
-  if (TRACE_msg_process_is_enabled()) {
-    pajeDefineStateType("category", "PROCESS", "category");
-    pajeDefineStateType("presence", "PROCESS", "presence");
+  //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"), NULL);
+
+  //define final_color
+  char final_color[INSTR_DEFAULT_STR_SIZE];
+  if (!color){
+    //generate a random color
+    double red = drand48();
+    double green = drand48();
+    double blue = drand48();
+    snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%f %f %f", red, green, blue);
+  }else{
+    snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
   }
 
-  if (TRACE_msg_volume_is_enabled()) {
-    pajeDefineLinkType("volume", "0", "PROCESS", "PROCESS", "volume");
+  XBT_DEBUG("CAT,declare %s, %s", category, final_color);
+
+  //define the type of this category on top of hosts and links
+  instr_new_variable_type (category, final_color);
+}
+
+void TRACE_declare_mark(const char *mark_type)
+{
+  /* safe switch */
+  if (!TRACE_is_enabled()) return;
+
+  if (!mark_type) return;
+
+  XBT_DEBUG("MARK,declare %s", mark_type);
+  PJ_type_event_new(mark_type, NULL, PJ_type_get_root());
+}
+
+void TRACE_mark(const char *mark_type, const char *mark_value)
+{
+  /* safe switch */
+  if (!TRACE_is_enabled()) return;
+
+  if (!mark_type || !mark_value) 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){
+    THROWF (tracing_error, 1, "mark_type with name (%s) not declared before", mark_type);
   }
+  val_t value = PJ_value_get (mark_value, type);
+  if (value == NULL){
+    value = PJ_value_new (mark_value, NULL, type);
+  }
+  new_pajeNewEvent (MSG_get_clock(), PJ_container_get_root(), type, value);
+}
 
-  /* 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");
+static void instr_user_variable(double time,
+                         const char *resource,
+                         const char *variable,
+                         const char *father_type,
+                         double value,
+                         InstrUserVariable what,
+                         const char *color)
+{
+  /* safe switch */
+  if (!TRACE_is_enabled()) return;
+
+  /* if platform is not traced, we can't deal user variables */
+  if (!TRACE_needs_platform()) return;
+
+  char valuestr[100];
+  snprintf(valuestr, 100, "%g", value);
+
+  switch (what){
+  case INSTR_US_DECLARE:
+    instr_new_user_variable_type (father_type, variable, color);
+    break;
+  case INSTR_US_SET:
+  {
+    container_t container = PJ_container_get(resource);
+    type_t type = PJ_type_get (variable, container->type);
+    new_pajeSetVariable(time, container, type, value);
+    break;
+  }
+  case INSTR_US_ADD:
+  {
+    container_t container = PJ_container_get(resource);
+    type_t type = PJ_type_get (variable, container->type);
+    new_pajeAddVariable(time, container, type, value);
+    break;
+  }
+  case INSTR_US_SUB:
+  {
+    container_t container = PJ_container_get(resource);
+    type_t type = PJ_type_get (variable, container->type);
+    new_pajeSubVariable(time, container, type, value);
+    break;
+  }
+  default:
+    //TODO: launch exception
+    break;
   }
+}
 
-  /* 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");
+static void instr_user_srcdst_variable(double time,
+                              const char *src,
+                              const char *dst,
+                              const char *variable,
+                              const char *father_type,
+                              double value,
+                              InstrUserVariable what)
+{
+  xbt_dynar_t route=NULL;
+  network_element_t src_elm = xbt_lib_get_or_null(host_lib,src,ROUTING_HOST_LEVEL);
+  if(!src_elm) src_elm = xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL);
+  if(!src_elm) xbt_die("Element '%s' not found!",src);
+
+  network_element_t dst_elm = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL);
+  if(!dst_elm) dst_elm = xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
+  if(!dst_elm) xbt_die("Element '%s' not found!",dst);
+
+  routing_get_route_and_latency (src_elm, dst_elm, &route,NULL);
+  unsigned int i;
+  void *link;
+  xbt_dynar_foreach (route, i, link) {
+    char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
+    instr_user_variable (time, link_name, variable, father_type, value, what, NULL);
   }
+}
 
-  /* 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;
+
+xbt_graph_t TRACE_platform_graph (void)
+{
+  if (!TRACE_is_enabled()) return NULL;
+  return instr_routing_platform_graph ();
 }
 
-int TRACE_end()
+void TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename)
 {
-  if (!TRACE_is_active())
-    return 1;
-  XBT_IN;
+  instr_routing_platform_graph_export_graphviz (g, filename);
+}
 
-  /* close the trace file */
-  TRACE_paje_end();
 
-  /* generate uncategorized graph configuration for triva */
-  if (TRACE_get_triva_uncat_conf()){
-    TRACE_generate_triva_uncat_conf();
-  }
+/*
+ * Derived functions that use instr_user_variable and TRACE_user_srcdst_variable.
+ * They were previously defined as pre-processors directives, but were transformed
+ * into functions so the user can track them using gdb.
+ */
 
-  /* generate categorized graph configuration for triva */
-  if (TRACE_get_triva_cat_conf()){
-    TRACE_generate_triva_cat_conf();
-  }
+/* for host variables */
+void TRACE_host_variable_declare (const char *var)
+{
+  instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE, NULL);
+}
 
-  /* activate trace */
-  TRACE_desactivate ();
-  DEBUG0("Tracing system is shutdown");
-  return 0;
+void TRACE_host_variable_declare_with_color (const char *var, const char *color)
+{
+  instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE, color);
 }
 
-int TRACE_category(const char *category)
+void TRACE_host_variable_set (const char *host, const char *variable, double value)
 {
-  return TRACE_category_with_color (category, NULL);
+  TRACE_host_variable_set_with_time (MSG_get_clock(), host, variable, value);
 }
 
-int TRACE_category_with_color (const char *category, const char *color)
+void TRACE_host_variable_add (const char *host, const char *variable, double value)
 {
-  static int first_time = 1;
-  if (!TRACE_is_active())
-    return 1;
+  TRACE_host_variable_add_with_time (MSG_get_clock(), host, variable, value);
+}
 
-  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_host_variable_sub (const char *host, const char *variable, double value)
+{
+  TRACE_host_variable_sub_with_time (MSG_get_clock(), host, variable, value);
 }
 
-void TRACE_define_type(const char *type,
-                       const char *parent_type, int final)
+void TRACE_host_variable_set_with_time (double time, const char *host, const char *variable, double value)
 {
-  char *val_one = NULL;
-  if (!TRACE_is_active())
-    return;
-
-  char *defined;
-  //type must not exist
-  defined = xbt_dict_get_or_null(defined_types, type);
-  xbt_assert1 (defined == NULL, "Type %s is already defined", type);
-  //parent_type must exist or be different of 0
-  defined = xbt_dict_get_or_null(defined_types, parent_type);
-  xbt_assert1 (defined != NULL || strcmp(parent_type, "0") == 0,
-      "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);
+  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET, NULL);
 }
 
-int TRACE_create_category(const char *category,
-                          const char *type, const char *parent_category)
+void TRACE_host_variable_add_with_time (double time, const char *host, const char *variable, double value)
 {
-  return TRACE_create_category_with_color (category, type, parent_category, NULL);
+  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD, NULL);
 }
 
-int TRACE_create_category_with_color(const char *category,
-                          const char *type,
-                          const char *parent_category,
-                          const char *color)
+void TRACE_host_variable_sub_with_time (double time, const char *host, const char *variable, double value)
 {
-  char state[100];
-  char *val_one = NULL;
-  if (!TRACE_is_active())
-    return 1;
-
-  char *defined = xbt_dict_get_or_null(defined_types, type);
-  //check if type is defined
-  xbt_assert1 (defined != NULL, "Type %s is not defined", type);
-  //check if parent_category exists
-  defined = xbt_dict_get_or_null(created_categories, parent_category);
-  xbt_assert1 (defined != NULL || strcmp(parent_category, "0") == 0,
-      "Category (used as parent) %s is not created", parent_category);
-  //check if category is created
-  char *created = xbt_dict_get_or_null(created_categories, category);
-  xbt_assert1 (created == NULL, "Category %s is already defined", category);
+  instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB, NULL);
+}
 
-  pajeCreateContainer(MSG_get_clock(), category, type, parent_category,
-                      category);
+/* for link variables */
+void TRACE_link_variable_declare (const char *var)
+{
+  instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE, NULL);
+}
 
-  char final_color[INSTR_DEFAULT_STR_SIZE];
-  if (!color){
-    //generate a random color
-    double red = drand48();
-    double green = drand48();
-    double blue = drand48();
-    snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%f %f %f", red, green, blue);
-  }else{
-    snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
-  }
+void TRACE_link_variable_declare_with_color (const char *var, const char *color)
+{
+  instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE, color);
+}
+
+void TRACE_link_variable_set (const char *link, const char *variable, double value)
+{
+  TRACE_link_variable_set_with_time (MSG_get_clock(), link, variable, value);
+}
 
-  DEBUG2("CAT,declare %s, %s", category, final_color);
+void TRACE_link_variable_add (const char *link, const char *variable, double value)
+{
+  TRACE_link_variable_add_with_time (MSG_get_clock(), link, variable, value);
+}
 
-  /* 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);
+void TRACE_link_variable_sub (const char *link, const char *variable, double value)
+{
+  TRACE_link_variable_sub_with_time (MSG_get_clock(), link, variable, value);
+}
 
-  val_one = xbt_strdup("1");
-  xbt_dict_set(created_categories, category, &val_one, xbt_free);
-  return 0;
+void TRACE_link_variable_set_with_time (double time, const char *link, const char *variable, double value)
+{
+  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET, NULL);
 }
 
-void TRACE_declare_mark(const char *mark_type)
+void TRACE_link_variable_add_with_time (double time, const char *link, const char *variable, double value)
 {
-  if (!TRACE_is_active())
-    return;
-  if (!mark_type)
-    return;
+  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD, NULL);
+}
 
-  DEBUG1("MARK,declare %s", mark_type);
-  pajeDefineEventType(mark_type, "0", mark_type);
+void TRACE_link_variable_sub_with_time (double time, const char *link, const char *variable, double value)
+{
+  instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB, NULL);
 }
 
-void TRACE_mark(const char *mark_type, const char *mark_value)
+/* for link variables, but with src and dst used for get_route */
+void TRACE_link_srcdst_variable_set (const char *src, const char *dst, const char *variable, double value)
 {
-  if (!TRACE_is_active())
-    return;
-  if (!mark_type || !mark_value)
-    return;
+  TRACE_link_srcdst_variable_set_with_time (MSG_get_clock(), src, dst, variable, value);
+}
 
-  DEBUG2("MARK %s %s", mark_type, mark_value);
-  pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
+void TRACE_link_srcdst_variable_add (const char *src, const char *dst, const char *variable, double value)
+{
+  TRACE_link_srcdst_variable_add_with_time (MSG_get_clock(), src, dst, variable, value);
+}
+
+void TRACE_link_srcdst_variable_sub (const char *src, const char *dst, const char *variable, double value)
+{
+  TRACE_link_srcdst_variable_sub_with_time (MSG_get_clock(), src, dst, variable, value);
+}
+
+void TRACE_link_srcdst_variable_set_with_time (double time, const char *src, const char *dst, const char *variable, double value)
+{
+  instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_SET);
+}
+
+void TRACE_link_srcdst_variable_add_with_time (double time, const char *src, const char *dst, const char *variable, double value)
+{
+  instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_ADD);
+}
+
+void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, const char *dst, const char *variable, double value)
+{
+  instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_SUB);
 }
 
 #endif /* HAVE_TRACING */