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
have tests passing without smpi
[simgrid.git]
/
src
/
instr
/
instr_paje_trace.cpp
diff --git
a/src/instr/instr_paje_trace.cpp
b/src/instr/instr_paje_trace.cpp
index
9a9e631
..
4ab7004
100644
(file)
--- a/
src/instr/instr_paje_trace.cpp
+++ b/
src/instr/instr_paje_trace.cpp
@@
-8,6
+8,7
@@
#include "xbt/virtu.h" /* sg_cmdline */
#include <sstream>
#include <iomanip> /** std::setprecision **/
#include "xbt/virtu.h" /* sg_cmdline */
#include <sstream>
#include <iomanip> /** std::setprecision **/
+#include "simgrid/sg_config.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr_trace, "tracing event system");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr_trace, "tracing event system");
@@
-99,7
+100,7
@@
void TRACE_paje_init(void) {
void TRACE_paje_start(void) {
char *filename = TRACE_get_filename();
tracing_file = fopen(filename, "w");
void TRACE_paje_start(void) {
char *filename = TRACE_get_filename();
tracing_file = fopen(filename, "w");
- if (tracing_file ==
NULL
){
+ if (tracing_file ==
nullptr
){
THROWF (system_error, 1, "Tracefile %s could not be opened for writing.", filename);
}
THROWF (system_error, 1, "Tracefile %s could not be opened for writing.", filename);
}
@@
-222,6
+223,12
@@
void print_pajeSetState(paje_event_t event) {
print_default_pajeState_row<setState_t>(event);
stream << " " << static_cast<setState_t>(event->data)->value->id;
print_default_pajeState_row<setState_t>(event);
stream << " " << static_cast<setState_t>(event->data)->value->id;
+#if HAVE_SMPI
+ if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+ stream << " \"" << static_cast<setState_t>(event->data)->filename
+ << "\" " << static_cast<setState_t>(event->data)->linenumber;
+ }
+#endif
print_row();
}
print_row();
}
@@
-232,19
+239,25
@@
void print_pajePushState(paje_event_t event) {
if (TRACE_display_sizes()) {
stream << " ";
if (TRACE_display_sizes()) {
stream << " ";
- if (static_cast<pushState_t>(event->data)->extra !=
NULL
) {
+ if (static_cast<pushState_t>(event->data)->extra !=
nullptr
) {
stream << static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->send_size;
}
else {
stream << 0;
}
}
stream << static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->send_size;
}
else {
stream << 0;
}
}
+#if HAVE_SMPI
+ if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
+ stream << " \"" << static_cast<pushState_t>(event->data)->filename
+ << "\" " << static_cast<pushState_t>(event->data)->linenumber;
+ }
+#endif
print_row();
print_row();
- if (static_cast<pushState_t>(event->data)->extra !=
NULL
) {
- if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->sendcounts !=
NULL
)
+ if (static_cast<pushState_t>(event->data)->extra !=
nullptr
) {
+ if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->sendcounts !=
nullptr
)
xbt_free(static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->sendcounts);
xbt_free(static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->sendcounts);
- if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->recvcounts !=
NULL
)
+ if (static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->recvcounts !=
nullptr
)
xbt_free(static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->recvcounts);
xbt_free(static_cast<pushState_t>(event->data)->extra);
}
xbt_free(static_cast<instr_extra_data>(static_cast<pushState_t>(event->data)->extra)->recvcounts);
xbt_free(static_cast<pushState_t>(event->data)->extra);
}