A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mention-debian-package-for-bibtex2html' of git://github.com/ln/simgrid
[simgrid.git]
/
src
/
instr
/
instr_config.c
diff --git
a/src/instr/instr_config.c
b/src/instr/instr_config.c
index
08474b4
..
998e2aa
100644
(file)
--- a/
src/instr/instr_config.c
+++ b/
src/instr/instr_config.c
@@
-39,7
+39,7
@@
int TRACE_start()
return 0;
}
return 0;
}
-
DEBUG0
("Tracing starts");
+
XBT_DEBUG
("Tracing starts");
/* open the trace file */
TRACE_paje_start();
/* open the trace file */
TRACE_paje_start();
@@
-71,7
+71,7
@@
int TRACE_end()
/* dump trace buffer */
TRACE_last_timestamp_to_dump = surf_get_clock();
/* dump trace buffer */
TRACE_last_timestamp_to_dump = surf_get_clock();
- TRACE_paje_dump_buffer();
+ TRACE_paje_dump_buffer(
1
);
/* destroy all data structures of tracing (and free) */
destroyAllContainers();
/* destroy all data structures of tracing (and free) */
destroyAllContainers();
@@
-81,21
+81,21
@@
int TRACE_end()
/* activate trace */
TRACE_desactivate ();
/* activate trace */
TRACE_desactivate ();
-
DEBUG0
("Tracing system is shutdown");
+
XBT_DEBUG
("Tracing system is shutdown");
return 0;
}
void TRACE_activate (void)
{
return 0;
}
void TRACE_activate (void)
{
- xbt_assert
0
(trace_active==0, "Tracing is already active.");
+ xbt_assert (trace_active==0, "Tracing is already active.");
trace_active = 1;
trace_active = 1;
-
DEBUG0
("Tracing is on");
+
XBT_DEBUG
("Tracing is on");
}
void TRACE_desactivate (void)
{
trace_active = 0;
}
void TRACE_desactivate (void)
{
trace_active = 0;
-
DEBUG0
("Tracing is off");
+
XBT_DEBUG
("Tracing is off");
}
int TRACE_is_active (void)
}
int TRACE_is_active (void)
@@
-115,7
+115,8
@@
int TRACE_is_configured(void)
int TRACE_smpi_is_enabled(void)
{
int TRACE_smpi_is_enabled(void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI) &&
+ TRACE_is_enabled();
}
int TRACE_smpi_is_grouped(void)
}
int TRACE_smpi_is_grouped(void)
@@
-135,17
+136,20
@@
int TRACE_uncategorized (void)
int TRACE_msg_task_is_enabled(void)
{
int TRACE_msg_task_is_enabled(void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK) &&
+ TRACE_is_enabled();
}
int TRACE_msg_process_is_enabled(void)
{
}
int TRACE_msg_process_is_enabled(void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS) &&
+ TRACE_is_enabled();
}
int TRACE_msg_volume_is_enabled(void)
{
}
int TRACE_msg_volume_is_enabled(void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME) &&
+ TRACE_is_enabled();
}
char *TRACE_get_filename(void)
}
char *TRACE_get_filename(void)
@@
-354,7
+358,7
@@
void TRACE_generate_triva_uncat_conf (void)
char *name, *value;
FILE *file = fopen (output, "w");
char *name, *value;
FILE *file = fopen (output, "w");
- xbt_assert
1
(file != NULL,
+ xbt_assert (file != NULL,
"Unable to open file (%s) for writing triva graph "
"configuration (uncategorized).", output);
"Unable to open file (%s) for writing triva graph "
"configuration (uncategorized).", output);
@@
-432,12
+436,12
@@
void TRACE_generate_triva_cat_conf (void)
//check if we do have categories declared
if (xbt_dict_length(created_categories) == 0){
//check if we do have categories declared
if (xbt_dict_length(created_categories) == 0){
-
INFO0
("No categories declared, ignoring generation of triva graph configuration");
+
XBT_INFO
("No categories declared, ignoring generation of triva graph configuration");
return;
}
FILE *file = fopen (output, "w");
return;
}
FILE *file = fopen (output, "w");
- xbt_assert
1
(file != NULL,
+ xbt_assert (file != NULL,
"Unable to open file (%s) for writing triva graph "
"configuration (categorized).", output);
"Unable to open file (%s) for writing triva graph "
"configuration (categorized).", output);