XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
std::ofstream tracing_file;
-std::map<container_t, std::ofstream*> tracing_files; // TI specific
+std::map<const simgrid::instr::Container*, std::ofstream*> tracing_files; // TI specific
double prefix = 0.0; // TI specific
constexpr char OPT_TRACING_BASIC[] = "tracing/basic";
{
std::string str = std::string("--cfg=") + option + " ";
- int len = str.size();
+ int len = static_cast<int>(str.size());
XBT_HELP("%s%*.*s %s", str.c_str(), 30 - len, 30 - len, "", desc);
if (longdesc != nullptr) {
XBT_HELP("%s\n", longdesc);
/*************
* Callbacks *
*************/
-xbt::signal<void(Container&)> Container::on_creation;
-xbt::signal<void(Container&)> Container::on_destruction;
-xbt::signal<void(EntityValue&)> EntityValue::on_creation;
-xbt::signal<void(Type&, e_event_type)> Type::on_creation;
-xbt::signal<void(LinkType&, Type&, Type&)> LinkType::on_creation;
-
-static void on_container_creation_paje(Container& c)
+xbt::signal<void(Container const&)> Container::on_creation;
+xbt::signal<void(Container const&)> Container::on_destruction;
+xbt::signal<void(Type const&, e_event_type)> Type::on_creation;
+xbt::signal<void(LinkType const&, Type const&, Type const&)> LinkType::on_creation;
+xbt::signal<void(PajeEvent&)> PajeEvent::on_creation;
+xbt::signal<void(PajeEvent const&)> PajeEvent::on_destruction;
+xbt::signal<void(StateEvent const&)> StateEvent::on_destruction;
+xbt::signal<void(EntityValue const&)> EntityValue::on_creation;
+
+static void on_container_creation_paje(const Container& c)
{
double timestamp = SIMIX_get_clock();
std::stringstream stream;
tracing_file << stream.str() << std::endl;
}
-static void on_container_destruction_paje(Container& c)
+static void on_container_destruction_paje(const Container& c)
{
- // obligation to dump previous events because they might reference the container that is about to be destroyed
- last_timestamp_to_dump = SIMIX_get_clock();
- dump_buffer(true);
-
// trace my destruction, but not if user requests so or if the container is root
if (not trace_disable_destroy && &c != Container::get_root()) {
std::stringstream stream;
}
}
-static void on_container_creation_ti(Container& c)
+static void on_container_creation_ti(const Container& c)
{
XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_CreateContainer, SIMIX_get_clock());
// if we are in the mode with only one file
tracing_files.insert({&c, ti_unique_file});
}
-static void on_container_destruction_ti(Container& c)
+static void on_container_destruction_ti(const Container& c)
{
- // obligation to dump previous events because they might reference the container that is about to be destroyed
- last_timestamp_to_dump = SIMIX_get_clock();
- dump_buffer(true);
-
if (not trace_disable_destroy && &c != Container::get_root()) {
- XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_DestroyContainer, SIMIX_get_clock());
if (not simgrid::config::get_value<bool>("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) {
tracing_files.at(&c)->close();
delete tracing_files.at(&c);
}
}
-static void on_entity_value_creation(EntityValue& value)
+static void on_entity_value_creation(const EntityValue& value)
{
std::stringstream stream;
XBT_DEBUG("%s: event_type=%u", __func__, PAJE_DefineEntityValue);
tracing_file << stream.str() << std::endl;
}
-static void on_type_creation(Type& type, e_event_type event_type)
+static void on_event_creation(PajeEvent& event)
+{
+ XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, event.eventType_, trace_precision, event.timestamp_);
+ event.stream_ << std::fixed << std::setprecision(trace_precision);
+ event.stream_ << event.eventType_ << " " << event.timestamp_ << " ";
+ event.stream_ << event.get_type()->get_id() << " " << event.get_container()->get_id();
+}
+
+static void on_event_destruction(const PajeEvent& event)
+{
+ XBT_DEBUG("Dump %s", event.stream_.str().c_str());
+ tracing_file << event.stream_.str() << std::endl;
+}
+
+static void on_state_event_destruction(const StateEvent& event)
+{
+ if (event.has_extra())
+ *tracing_files.at(event.get_container()) << event.stream_.str() << std::endl;
+}
+
+static void on_type_creation(const Type& type, e_event_type event_type)
{
if (event_type == PAJE_DefineLinkType)
return; // this kind of type has to be handled differently
tracing_file << stream.str() << std::endl;
}
-static void on_link_type_creation(Type& type, Type& source, Type& dest)
+static void on_link_type_creation(const Type& type, const Type& source, const Type& dest)
{
std::stringstream stream;
XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, PAJE_DefineLinkType, trace_precision, 0.);
EntityValue::on_creation.connect(on_entity_value_creation);
Type::on_creation.connect(on_type_creation);
LinkType::on_creation.connect(on_link_type_creation);
+ PajeEvent::on_creation.connect(on_event_creation);
+ PajeEvent::on_destruction.connect(on_event_destruction);
paje::dump_generator_version();
trace_format = TraceFormat::Ti;
Container::on_creation.connect(on_container_creation_ti);
Container::on_destruction.connect(on_container_destruction_ti);
+ StateEvent::on_destruction.connect(on_state_event_destruction);
}
trace_active = true;