merging tracing changes

[simgrid.git] / src / instr / instr_config.c

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index defc1f5..2ca1451 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -21,7 +21,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 #define OPT_TRACING_MSG_PROCESS   "tracing/msg/process"
 #define OPT_TRACING_MSG_VOLUME    "tracing/msg/volume"
 #define OPT_TRACING_FILENAME      "tracing/filename"
-#define OPT_TRACING_PLATFORM_METHOD "tracing/platform/method"
+#define OPT_TRACING_BUFFER        "tracing/buffer"
 #define OPT_TRIVA_UNCAT_CONF      "triva/uncategorized"
 #define OPT_TRIVA_CAT_CONF        "triva/categorized"
 
@@ -152,14 +152,15 @@ int TRACE_msg_volume_is_enabled(void)
       TRACE_is_enabled();
 }
 
-char *TRACE_get_filename(void)
+int TRACE_buffer (void)
 {
-  return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
+  return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_BUFFER) &&
+      TRACE_is_enabled();
 }
 
-char *TRACE_get_platform_method(void)
+char *TRACE_get_filename(void)
 {
-  return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD);
+  return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
 }
 
 char *TRACE_get_triva_uncat_conf (void)
@@ -217,13 +218,6 @@ void TRACE_global_init(int *argc, char **argv)
                    xbt_cfgelm_int, &default_tracing_uncategorized, 0, 1,
                    NULL, NULL);
 
-  /* platform method */
-  char *default_tracing_platform_method = xbt_strdup("a");
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD,
-                   "Tracing method used to register categorized resource behavior.",
-                   xbt_cfgelm_string, &default_tracing_platform_method, 1,
-                   1, NULL, NULL);
-
   /* msg task */
   int default_tracing_msg_task = 0;
   xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_TASK,
@@ -245,6 +239,13 @@ void TRACE_global_init(int *argc, char **argv)
                    xbt_cfgelm_int, &default_tracing_msg_volume, 0, 1,
                    NULL, NULL);
 
+  /* msg volume (experimental) */
+  int default_buffer = 0;
+  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_BUFFER,
+                   "Buffer trace events to put them in temporal order.",
+                   xbt_cfgelm_int, &default_buffer, 0, 1,
+                   NULL, NULL);
+
   /* Triva graph configuration for uncategorized tracing */
   char *default_triva_uncat_conf_file = xbt_strdup ("");
   xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF,
@@ -292,18 +293,6 @@ void TRACE_help (int detailed)
       "  this simulator do not use tracing categories and resource use have to be\n"
       "  traced.",
       detailed);
-  print_line (OPT_TRACING_PLATFORM_METHOD, "Change the resource utilization tracing method",
-      "  It changes the way resource utilization (categorized or not) is traced\n"
-      "  inside the simulation core. Method 'a' (default) traces all updates defined\n"
-      "  by the CPU/network model of a given resource. Depending on the interface used\n"
-      "  by this simulator (MSG, SMPI, SimDAG), the default method can generate large\n"
-      "  trace files. Method 'b' tries to make smaller tracefiles using clever updates,\n"
-      "  without losing details of resource utilization. Method 'c' generates even\n"
-      "  smaller files by doing time integration during the simulation, but it loses\n"
-      "  precision. If this last method is used, the smallest timeslice used in the\n"
-      "  tracefile analysis must be bigger than the smaller resource utilization. If\n"
-      "  unsure, do not change this option.",
-      detailed);
   print_line (OPT_TRACING_FILENAME, "Filename to register traces",
       "  A file with this name will be created to register the simulation. The file\n"
       "  is in the Paje format and can be analyzed using Triva or Paje visualization\n"
@@ -334,6 +323,13 @@ void TRACE_help (int detailed)
       "  This experimental option only has effect if this simulator is MSG-based.\n"
       "  It traces the communication volume of MSG send/receive.",
       detailed);
+  print_line (OPT_TRACING_BUFFER, "Buffer events to put them in temporal order",
+      "  This option put some events in a time-ordered buffer using the insertion\n"
+      "  sort algorithm. The process of acquiring and releasing locks to access this\n"
+      "  buffer and the cost of the sorting algorithm make this process slow. The\n"
+      "  simulator performance can be severely impacted if this option is activated,\n"
+      "  but you are sure to get a trace file with events sorted.",
+      detailed);
   print_line (OPT_TRIVA_UNCAT_CONF, "Generate graph configuration for Triva",
       "  This option can be used in all types of simulators build with SimGrid\n"
       "  to generate a uncategorized resource utilization graph to be used as\n"
@@ -445,7 +441,7 @@ void TRACE_generate_triva_cat_conf (void)
         "    size = power;\n"
         "    values = (");
     xbt_dict_foreach(created_categories,cursor2,name2,value2) {
-      fprintf (file, "%s, ", name2);
+      fprintf (file, "p%s, ", name2);
     }
     fprintf (file,
         ");\n"
@@ -455,7 +451,7 @@ void TRACE_generate_triva_cat_conf (void)
         "    size = bandwidth;\n"
         "    values = (");
     xbt_dict_foreach(created_categories,cursor2,name2,value2) {
-      fprintf (file, "%s, ", name2);
+      fprintf (file, "b%s, ", name2);
     }
     fprintf (file,
         ");\n"