X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/974fb38ffe5712b82211fe2fab3a9bb32a4ac7a4..3203ed1f4fb6f4617e94d5351661ba07e8b8f833:/src/instr/instr_config.c?ds=sidebyside

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index e01762519b..978762ed2e 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -1,15 +1,13 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "simgrid/sg_config.h"
 #include "surf/surf.h"
 
-#ifdef HAVE_TRACING
-
 XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used for Visualization/Analysis of simulations)");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 
@@ -19,6 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 #define OPT_TRACING_SMPI          "tracing/smpi"
 #define OPT_TRACING_SMPI_GROUP    "tracing/smpi/group"
 #define OPT_TRACING_SMPI_COMPUTING "tracing/smpi/computing"
+#define OPT_TRACING_SMPI_SLEEPING "tracing/smpi/sleeping"
 #define OPT_TRACING_SMPI_INTERNALS "tracing/smpi/internals"
 #define OPT_TRACING_DISPLAY_SIZES  "tracing/smpi/display_sizes"
 #define OPT_TRACING_FORMAT        "tracing/smpi/format"
@@ -38,6 +37,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 #define OPT_VIVA_CAT_CONF        "viva/categorized"
 #define OPT_TRACING_DISABLE_LINK        "tracing/disable_link"
 #define OPT_TRACING_DISABLE_POWER       "tracing/disable_power"
+#define OPT_TRACING_PRECISION     "tracing/precision"
 
 static int trace_enabled = 0;
 static int trace_platform;
@@ -45,6 +45,7 @@ static int trace_platform_topology;
 static int trace_smpi_enabled;
 static int trace_smpi_grouped;
 static int trace_smpi_computing;
+static int trace_smpi_sleeping;
 static int trace_view_internals;
 static int trace_categorized;
 static int trace_uncategorized;
@@ -57,6 +58,7 @@ static int trace_basic;
 static int trace_display_sizes = 0;
 static int trace_disable_link;
 static int trace_disable_power;
+static int trace_precision;
 
 static int trace_configured = 0;
 static int trace_active = 0;
@@ -71,6 +73,7 @@ static void TRACE_getopts(void)
   trace_smpi_enabled = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI);
   trace_smpi_grouped = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI_GROUP);
   trace_smpi_computing = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING);
+  trace_smpi_sleeping = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI_SLEEPING);
   trace_view_internals = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS);
   trace_categorized = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_CATEGORIZED);
   trace_uncategorized = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED);
@@ -83,6 +86,7 @@ static void TRACE_getopts(void)
   trace_display_sizes = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_DISPLAY_SIZES);
   trace_disable_link = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_DISABLE_LINK);
   trace_disable_power = xbt_cfg_get_boolean(_sg_cfg_set, OPT_TRACING_DISABLE_POWER);
+  trace_precision = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_PRECISION);
 }
 
 static xbt_dynar_t TRACE_start_functions = NULL;
@@ -130,11 +134,11 @@ int TRACE_start()
     XBT_DEBUG("Tracing is on");
 
     /* other trace initialization */
-    created_categories = xbt_dict_new_homogeneous(xbt_free);
-    declared_marks = xbt_dict_new_homogeneous(xbt_free);
-    user_host_variables = xbt_dict_new_homogeneous(xbt_free);
-    user_vm_variables = xbt_dict_new_homogeneous (xbt_free);
-    user_link_variables = xbt_dict_new_homogeneous(xbt_free);
+    created_categories = xbt_dict_new_homogeneous(xbt_free_f);
+    declared_marks = xbt_dict_new_homogeneous(xbt_free_f);
+    user_host_variables = xbt_dict_new_homogeneous(xbt_free_f);
+    user_vm_variables = xbt_dict_new_homogeneous(xbt_free_f);
+    user_link_variables = xbt_dict_new_homogeneous(xbt_free_f);
 
     if (TRACE_start_functions != NULL) {
       void (*func) ();
@@ -259,6 +263,11 @@ int TRACE_smpi_is_computing(void)
   return trace_smpi_computing;
 }
 
+int TRACE_smpi_is_sleeping(void)
+{
+  return trace_smpi_sleeping;
+}
+
 int TRACE_smpi_view_internals(void)
 {
   return trace_view_internals;
@@ -329,6 +338,11 @@ char *TRACE_get_comment_file (void)
   return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_COMMENT_FILE);
 }
 
+int TRACE_precision (void)
+{
+  return xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_PRECISION);
+}
+
 char *TRACE_get_filename(void)
 {
   return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_FILENAME);
@@ -346,6 +360,10 @@ char *TRACE_get_viva_cat_conf (void)
 
 void TRACE_global_init(int *argc, char **argv)
 {
+  static int is_initialised = 0;
+  if (is_initialised) return;
+
+  is_initialised = 1;
   /* name of the tracefile */
   xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_FILENAME,
                    "Trace file created by the instrumented SimGrid.",
@@ -388,6 +406,13 @@ void TRACE_global_init(int *argc, char **argv)
                    xbt_cfgelm_boolean, 1, 1, NULL, NULL);
   xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING, "no");
 
+/* smpi sleeping */
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_SLEEPING,
+                   "Generate states for timing out of SMPI parts of the application",
+                   xbt_cfgelm_boolean, 1, 1, NULL, NULL);
+  xbt_cfg_setdefault_boolean(_sg_cfg_set, OPT_TRACING_SMPI_SLEEPING, "no");
+
+
   /* smpi internals */
   xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS,
                    "View internal messages sent by Collective communications in SMPI",
@@ -463,7 +488,7 @@ void TRACE_global_init(int *argc, char **argv)
 
   /* format -- Switch the ouput format of Tracing */
   xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_FORMAT,
-                   "(smpi only for now) Switch the ouput format of Tracing",
+                   "(smpi only for now) Switch the output format of Tracing",
                    xbt_cfgelm_string, 1, 1, NULL, NULL);
   xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_FORMAT, "Paje");
 
@@ -486,6 +511,12 @@ void TRACE_global_init(int *argc, char **argv)
                    xbt_cfgelm_string, 1, 1, NULL, NULL);
   xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_COMMENT_FILE, "");
 
+  /* trace timestamp precision */
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_PRECISION,
+                   "Numerical precision used when timestamping events (hence this value is expressed in number of digits after decimal point)",
+                   xbt_cfgelm_int, 1, 1, NULL, NULL);
+  xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_PRECISION, 6);
+
   /* Viva graph configuration for uncategorized tracing */
   xbt_cfg_register(&_sg_cfg_set, OPT_VIVA_UNCAT_CONF,
                    "Viva Graph configuration file for uncategorized resource utilization traces.",
@@ -553,6 +584,10 @@ void TRACE_help (int detailed)
       "  This option aims at tracing computations in the application, outside SMPI\n"
       "  to allow further study of simulated or real computation time",
       detailed);
+   print_line (OPT_TRACING_SMPI_SLEEPING, "Generates a \" Sleeping \" State",
+      "  This option aims at tracing sleeps in the application, outside SMPI\n"
+      "  to allow further study of simulated or real sleep time",
+      detailed);
   print_line (OPT_TRACING_SMPI_INTERNALS, "Generates tracing events corresponding",
       "  to point-to-point messages sent by collective communications",
       detailed);
@@ -801,5 +836,3 @@ void instr_resume_tracing (void)
 #undef OPT_TRACING_COMMENT_FILE
 #undef OPT_VIVA_UNCAT_CONF
 #undef OPT_VIVA_CAT_CONF
-
-#endif /* HAVE_TRACING */