X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9532edf044eed31bcf6de22916c8824e18f373ad..b23e1eb029a107cdc16abd13f0f4d3f0650f642a:/src/instr/instr_config.c

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 2db53d28fe..82033ace64 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -1,10 +1,10 @@
-/* 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"
 
@@ -37,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;
@@ -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;
@@ -84,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;
@@ -295,7 +298,7 @@ int TRACE_disable_link(void)
   return trace_disable_link && TRACE_is_enabled();
 }
 
-int TRACE_disable_power(void)
+int TRACE_disable_speed(void)
 {
   return trace_disable_power && TRACE_is_enabled();
 }
@@ -335,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);
@@ -352,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.",
@@ -476,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");
 
@@ -499,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.",