-/* Copyright (c) 2012-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-2020. 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. */
: container_(container), type_(type), timestamp_(timestamp), eventType_(eventType)
{
XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, eventType_, TRACE_precision(), timestamp_);
- if (trace_format == simgrid::instr::TraceFormat::Paje) {
+ if (trace_format == TraceFormat::Paje) {
stream_ << std::fixed << std::setprecision(TRACE_precision());
stream_ << eventType_ << " " << timestamp_ << " " << type_->get_id() << " " << container_->get_id();
}
insert_into_buffer();
-};
+}
void PajeEvent::print()
{
- if (trace_format != simgrid::instr::TraceFormat::Paje)
+ if (trace_format != TraceFormat::Paje)
return;
XBT_DEBUG("Dump %s", stream_.str().c_str());
{
#if HAVE_SMPI
if (simgrid::config::get_value<bool>("smpi/trace-call-location")) {
- smpi_trace_call_location_t* loc = smpi_trace_get_call_location();
+ const smpi_trace_call_location_t* loc = smpi_trace_get_call_location();
filename = loc->filename;
linenumber = loc->linenumber;
}
void NewEvent::print()
{
- if (trace_format != simgrid::instr::TraceFormat::Paje)
+ if (trace_format != TraceFormat::Paje)
return;
stream_ << " " << value->get_id();
void LinkEvent::print()
{
- if (trace_format != simgrid::instr::TraceFormat::Paje)
+ if (trace_format != TraceFormat::Paje)
return;
stream_ << " " << value_ << " " << endpoint_->get_id() << " " << key_;
void VariableEvent::print()
{
- if (trace_format != simgrid::instr::TraceFormat::Paje)
+ if (trace_format != TraceFormat::Paje)
return;
stream_ << " " << value_;
void StateEvent::print()
{
- if (trace_format == simgrid::instr::TraceFormat::Paje) {
-
+ if (trace_format == TraceFormat::Paje) {
if (value != nullptr) // PAJE_PopState Event does not need to have a value
stream_ << " " << value->get_id();
#endif
XBT_DEBUG("Dump %s", stream_.str().c_str());
tracing_file << stream_.str() << std::endl;
- } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
+ } else if (trace_format == TraceFormat::Ti) {
if (extra_ == nullptr)
return;
/* Unimplemented calls are: WAITANY, SENDRECV, SCAN, EXSCAN, SSEND, and ISSEND. */
-
+ std::string container_name(get_container()->get_name());
// FIXME: dirty extract "rank-" from the name, as we want the bare process id here
- if (get_container()->get_name().find("rank-") != 0) {
- stream_ << get_container()->get_name() << " " << extra_->print();
- } else {
+ if (get_container()->get_name().find("rank-") == 0) {
/* Subtract -1 because this is the process id and we transform it to the rank id */
- std::string container_name(get_container()->get_name());
- stream_ << stoi(container_name.erase(0, 5)) - 1 << " " << extra_->print();
+ container_name=std::to_string(stoi(container_name.erase(0, 5)) - 1);
+ }
+#if HAVE_SMPI
+ if (config::get_value<bool>("smpi/trace-call-location")) {
+ stream_ << container_name << " location " << filename << " " << linenumber << std::endl ;
}
+#endif
+ stream_ << container_name << " " << extra_->print();
*tracing_files.at(get_container()) << stream_.str() << std::endl;
} else {
THROW_IMPOSSIBLE;
}
-
- delete extra_;
-}
-}
}
+} // namespace instr
+} // namespace simgrid