#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_INTERNALS "tracing/smpi/internals"
+#define OPT_TRACING_DISPLAY_SIZES "tracing/smpi/display_sizes"
#define OPT_TRACING_CATEGORIZED "tracing/categorized"
#define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized"
#define OPT_TRACING_MSG_PROCESS "tracing/msg/process"
#define OPT_TRACING_COMMENT_FILE "tracing/comment_file"
#define OPT_VIVA_UNCAT_CONF "viva/uncategorized"
#define OPT_VIVA_CAT_CONF "viva/categorized"
+#define OPT_TRACING_DISABLE_LINK "tracing/disable_link"
+#define OPT_TRACING_DISABLE_POWER "tracing/disable_power"
static int trace_enabled;
static int trace_platform;
static int trace_smpi_enabled;
static int trace_smpi_grouped;
static int trace_smpi_computing;
+static int trace_view_internals;
static int trace_categorized;
static int trace_uncategorized;
static int trace_msg_process_enabled;
static int trace_onelink_only;
static int trace_disable_destroy;
static int trace_basic;
+static int trace_display_sizes = 0;
+static int trace_disable_link;
+static int trace_disable_power;
static int trace_configured = 0;
static int trace_active = 0;
trace_smpi_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI);
trace_smpi_grouped = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_GROUP);
trace_smpi_computing = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING);
+ trace_view_internals = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS);
trace_categorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_CATEGORIZED);
trace_uncategorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED);
trace_msg_process_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_MSG_PROCESS);
trace_onelink_only = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY);
trace_disable_destroy = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY);
trace_basic = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BASIC);
+ trace_display_sizes = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISPLAY_SIZES);
+ trace_disable_link = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_LINK);
+ trace_disable_power = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_POWER);
}
-xbt_dynar_t TRACE_start_functions = NULL;
+static xbt_dynar_t TRACE_start_functions = NULL;
void TRACE_add_start_function(void (*func) ())
{
if (TRACE_start_functions == NULL)
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);
if (TRACE_start_functions != NULL) {
return 0;
}
-xbt_dynar_t TRACE_end_functions = NULL;
+static xbt_dynar_t TRACE_end_functions = NULL;
void TRACE_add_end_function(void (*func) (void))
{
if (TRACE_end_functions == NULL)
xbt_dict_free(&user_link_variables);
xbt_dict_free(&user_host_variables);
+ xbt_dict_free(&user_vm_variables);
xbt_dict_free(&declared_marks);
xbt_dict_free(&created_categories);
int TRACE_needs_platform (void)
{
return TRACE_msg_process_is_enabled() ||
+ TRACE_msg_vm_is_enabled() ||
TRACE_categorized() ||
TRACE_uncategorized() ||
- TRACE_msg_vm_is_enabled() ||
TRACE_platform () ||
(TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped());
}
-
int TRACE_is_enabled(void)
{
return trace_enabled;
return trace_smpi_computing;
}
+int TRACE_smpi_view_internals(void)
+{
+ return trace_view_internals;
+}
int TRACE_categorized (void)
{
return trace_msg_vm_enabled && TRACE_is_enabled();
}
+int TRACE_disable_link(void)
+{
+ return trace_disable_link && TRACE_is_enabled();
+}
+
+int TRACE_disable_power(void)
+{
+ return trace_disable_power && TRACE_is_enabled();
+}
int TRACE_buffer (void)
{
return trace_basic && TRACE_is_enabled();
}
+int TRACE_display_sizes (void)
+{
+ return trace_display_sizes && trace_smpi_enabled && TRACE_is_enabled();
+}
+
char *TRACE_get_comment (void)
{
return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_COMMENT);
xbt_cfgelm_int, &default_tracing_smpi_computing, 0, 1,
NULL, NULL);
+ /* smpi internals */
+ int default_tracing_smpi_internals = 0;
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS,
+ "View internal messages sent by Collective communications in SMPI",
+ xbt_cfgelm_int, &default_tracing_smpi_internals, 0, 1,
+ NULL, NULL);
+
/* tracing categorized resource utilization traces */
int default_tracing_categorized = 0;
xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_CATEGORIZED,
"Tracing of MSG process behavior.",
xbt_cfgelm_int, &default_tracing_msg_process, 0, 1,
NULL, NULL);
- /* msg vm */
+
+ /* msg process */
int default_tracing_msg_vm = 0;
xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_VM,
- "Tracing of MSG VM behavior.",
+ "Tracing of MSG process behavior.",
xbt_cfgelm_int, &default_tracing_msg_vm, 0, 1,
NULL, NULL);
+ /* disable tracing link */
+ int default_tracing_disable_link = 0;
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_LINK,
+ "Do not trace link bandwidth and latency.",
+ xbt_cfgelm_int, &default_tracing_disable_link, 0, 1,
+ NULL, NULL);
+
+ /* disable tracing link */
+ int default_tracing_disable_power = 0;
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_POWER,
+ "Do not trace host power.",
+ xbt_cfgelm_int, &default_tracing_disable_power, 0, 1,
+ NULL, NULL);
+
+
/* tracing buffer */
int default_buffer = 1;
xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BUFFER,
xbt_cfgelm_int, &default_basic, 0, 1,
NULL, NULL);
+ /* display_sizes -- Extended events with message size information */
+ int default_display_sizes = 0;
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISPLAY_SIZES,
+ "(smpi only for now) Extended events with message size information",
+ xbt_cfgelm_int, &default_display_sizes, 0, 1,
+ NULL, NULL);
+
/* comment */
char *default_tracing_comment = xbt_strdup ("");
xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_COMMENT,
" 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_INTERNALS, "Generates tracing events corresponding",
+ " to point-to-point messages sent by collective communications",
+ detailed);
print_line (OPT_TRACING_MSG_PROCESS, "Trace processes behavior (MSG)",
" This option only has effect if this simulator is MSG-based. It traces the\n"
" behavior of all categorized MSG processes, grouping them by hosts. This option\n"
" trace. Keep in mind that the trace might be incomplete, without all the\n"
" information that would be registered otherwise.",
detailed);
+ print_line (OPT_TRACING_DISPLAY_SIZES, "Only works for SMPI now. Add message size information",
+ "Message size (in bytes) is added to links, and to states. For collectives, the displayed value \n"
+ "is the more relevant to the collective (total sent by the process, usually)",
+ detailed);
print_line (OPT_TRACING_COMMENT, "Comment to be added on the top of the trace file.",
" Use this to add a comment line to the top of the trace file.",
detailed);
