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");
-#define OPT_TRACING "tracing"
-#define OPT_TRACING_PLATFORM "tracing/platform"
-#define OPT_TRACING_TOPOLOGY "tracing/platform/topology"
-#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"
-#define OPT_TRACING_FORMAT_TI_ONEFILE "tracing/smpi/format/ti_one_file"
-#define OPT_TRACING_CATEGORIZED "tracing/categorized"
-#define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized"
-#define OPT_TRACING_MSG_PROCESS "tracing/msg/process"
-#define OPT_TRACING_MSG_VM "tracing/msg/vm"
-#define OPT_TRACING_FILENAME "tracing/filename"
-#define OPT_TRACING_BUFFER "tracing/buffer"
-#define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only"
-#define OPT_TRACING_DISABLE_DESTROY "tracing/disable_destroy"
-#define OPT_TRACING_BASIC "tracing/basic"
-#define OPT_TRACING_COMMENT "tracing/comment"
-#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"
-#define OPT_TRACING_PRECISION "tracing/precision"
+#define OPT_TRACING_BASIC "tracing/basic"
+#define OPT_TRACING_BUFFER "tracing/buffer"
+#define OPT_TRACING_CATEGORIZED "tracing/categorized"
+#define OPT_TRACING_COMMENT_FILE "tracing/comment_file"
+#define OPT_TRACING_COMMENT "tracing/comment"
+#define OPT_TRACING_DISABLE_DESTROY "tracing/disable_destroy"
+#define OPT_TRACING_DISABLE_LINK "tracing/disable_link"
+#define OPT_TRACING_DISABLE_POWER "tracing/disable_power"
+#define OPT_TRACING_DISPLAY_SIZES "tracing/smpi/display_sizes"
+#define OPT_TRACING_FILENAME "tracing/filename"
+#define OPT_TRACING_FORMAT_TI_ONEFILE "tracing/smpi/format/ti_one_file"
+#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"
+#define OPT_TRACING_SMPI_GROUP "tracing/smpi/group"
+#define OPT_TRACING_SMPI_INTERNALS "tracing/smpi/internals"
+#define OPT_TRACING_SMPI_SLEEPING "tracing/smpi/sleeping"
+#define OPT_TRACING_SMPI "tracing/smpi"
+#define OPT_TRACING_TOPOLOGY "tracing/platform/topology"
+#define OPT_TRACING "tracing"
+#define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized"
+#define OPT_VIVA_CAT_CONF "viva/categorized"
+#define OPT_VIVA_UNCAT_CONF "viva/uncategorized"
static int trace_enabled = 0;
static int trace_platform;