-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2018. 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. */
#define OPT_TRACING_FORMAT "tracing/smpi/format"
#define OPT_TRACING_MSG_PROCESS "tracing/msg/process"
#define OPT_TRACING_MSG_VM "tracing/msg/vm"
-#define OPT_TRACING_ONELINK_ONLY "tracing/onelink-only"
#define OPT_TRACING_PLATFORM "tracing/platform"
#define OPT_TRACING_PRECISION "tracing/precision"
#define OPT_TRACING_SMPI_COMPUTING "tracing/smpi/computing"
static bool trace_view_internals;
static bool trace_categorized;
static bool trace_uncategorized;
-static bool trace_msg_process_enabled;
+static bool trace_actor_enabled;
static bool trace_msg_vm_enabled;
static bool trace_buffer;
-static bool trace_onelink_only;
static bool trace_disable_destroy;
static bool trace_basic;
static bool trace_display_sizes = false;
trace_view_internals = xbt_cfg_get_boolean(OPT_TRACING_SMPI_INTERNALS);
trace_categorized = xbt_cfg_get_boolean(OPT_TRACING_CATEGORIZED);
trace_uncategorized = xbt_cfg_get_boolean(OPT_TRACING_UNCATEGORIZED);
- trace_msg_process_enabled = xbt_cfg_get_boolean(OPT_TRACING_MSG_PROCESS);
+ trace_actor_enabled = trace_enabled && xbt_cfg_get_boolean(OPT_TRACING_MSG_PROCESS);
trace_msg_vm_enabled = xbt_cfg_get_boolean(OPT_TRACING_MSG_VM);
trace_buffer = xbt_cfg_get_boolean(OPT_TRACING_BUFFER);
- trace_onelink_only = xbt_cfg_get_boolean(OPT_TRACING_ONELINK_ONLY);
trace_disable_destroy = xbt_cfg_get_boolean(OPT_TRACING_DISABLE_DESTROY);
trace_basic = xbt_cfg_get_boolean(OPT_TRACING_BASIC);
trace_display_sizes = xbt_cfg_get_boolean(OPT_TRACING_DISPLAY_SIZES);
bool TRACE_needs_platform ()
{
- return TRACE_msg_process_is_enabled() || TRACE_msg_vm_is_enabled() || TRACE_categorized() ||
- TRACE_uncategorized() || TRACE_platform () || (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped());
+ return TRACE_actor_is_enabled() || TRACE_msg_vm_is_enabled() || TRACE_categorized() || TRACE_uncategorized() ||
+ TRACE_platform() || (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped());
}
bool TRACE_is_enabled()
return trace_uncategorized;
}
-bool TRACE_msg_process_is_enabled()
+bool TRACE_actor_is_enabled()
{
- return trace_msg_process_enabled && TRACE_is_enabled();
+ return trace_actor_enabled;
}
bool TRACE_msg_vm_is_enabled()
return trace_buffer && TRACE_is_enabled();
}
-bool TRACE_onelink_only ()
-{
- return trace_onelink_only && TRACE_is_enabled();
-}
-
bool TRACE_disable_destroy ()
{
return trace_disable_destroy && TRACE_is_enabled();
xbt_cfg_register_boolean(OPT_TRACING_DISABLE_POWER, "no", nullptr, "Do not trace host power.");
xbt_cfg_register_boolean(OPT_TRACING_BUFFER, "yes", nullptr, "Buffer trace events to put them in temporal order.");
- xbt_cfg_register_boolean(OPT_TRACING_ONELINK_ONLY, "no", nullptr, "Use only routes with one link to trace platform.");
xbt_cfg_register_boolean(OPT_TRACING_DISABLE_DESTROY, "no", nullptr, "Disable platform containers destruction.");
xbt_cfg_register_boolean(OPT_TRACING_BASIC, "no", nullptr, "Avoid extended events (impoverished trace file).");
xbt_cfg_register_boolean(OPT_TRACING_DISPLAY_SIZES, "no", nullptr, "(smpi only) Extended events with message size information");
xbt_cfg_register_alias(OPT_TRACING_DISABLE_POWER, "tracing/disable_power");
xbt_cfg_register_alias(OPT_TRACING_DISPLAY_SIZES, "tracing/smpi/display_sizes");
xbt_cfg_register_alias(OPT_TRACING_FORMAT_TI_ONEFILE, "tracing/smpi/format/ti_one_file");
- xbt_cfg_register_alias(OPT_TRACING_ONELINK_ONLY, "tracing/onelink_only");
/* instrumentation can be considered configured now */
trace_configured = true;
" 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_TRACING_ONELINK_ONLY, "Consider only one link routes to trace platform",
- " This option changes the way SimGrid register its platform on the trace file.\n"
- " Normally, the tracing considers all routes (no matter their size) on the\n"
- " platform file to re-create the resource topology. If this option is activated,\n"
- " only the routes with one link are used to register the topology within an AS.\n"
- " Routes among AS continue to be traced as usual.", detailed);
print_line (OPT_TRACING_DISABLE_DESTROY, "Disable platform containers destruction",
" Disable the destruction of containers at the end of simulation. This can be\n"
" used with simulators that have a different notion of time (different from\n"
}
xbt_dynar_free (&types);
}
-
-static int previous_trace_state = -1;
-
-void instr_pause_tracing ()
-{
- previous_trace_state = trace_enabled;
- if (not TRACE_is_enabled()) {
- XBT_DEBUG ("Tracing is already paused, therefore do nothing.");
- }else{
- XBT_DEBUG ("Tracing is being paused.");
- }
- trace_enabled = false;
- XBT_DEBUG ("Tracing is paused.");
-}
-
-void instr_resume_tracing ()
-{
- if (TRACE_is_enabled()){
- XBT_DEBUG ("Tracing is already running while trying to resume, therefore do nothing.");
- }else{
- XBT_DEBUG ("Tracing is being resumed.");
- }
-
- if (previous_trace_state != -1){
- trace_enabled = previous_trace_state;
- }else{
- trace_enabled = true;
- }
- XBT_DEBUG ("Tracing is resumed.");
- previous_trace_state = -1;
-}
