X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13e64de335db45c87e2d7c8668ce8b16b7cb2139..cee8b7d98f1c3b6738ad5f0b20de7bed9ba08d5a:/src/instr/instr_config.cpp diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index f1c9d17394..688ff68efe 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -1,14 +1,14 @@ -/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. 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. */ -#include "include/xbt/config.hpp" -#include "simgrid/Exception.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/version.h" +#include +#include + #include "src/instr/instr_private.hpp" -#include "surf/surf.hpp" +#include "xbt/config.hpp" +#include "xbt/xbt_os_time.h" #include #ifdef WIN32 @@ -23,8 +23,7 @@ XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used fo XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); std::ofstream tracing_file; -std::map tracing_files; // TI specific -double prefix = 0.0; // TI specific +std::map tracing_files; // TI specific constexpr char OPT_TRACING_BASIC[] = "tracing/basic"; constexpr char OPT_TRACING_COMMENT_FILE[] = "tracing/comment-file"; @@ -37,7 +36,7 @@ static simgrid::config::Flag trace_enabled{ "tracing", "Enable the tracing system. You have to enable this option to use other tracing options.", false}; static simgrid::config::Flag trace_actor_enabled{ - "tracing/msg/process", // FIXME rename this flag + "tracing/actor", "Trace the behavior of all categorized actors, grouping them by host. " "Can be used to track actor location if the simulator does actor migration.", false}; @@ -72,8 +71,8 @@ static simgrid::config::Flag trace_uncategorized{ "To use if the simulator does not use tracing categories but resource utilization have to be traced.", false}; -static simgrid::config::Flag trace_disable_destroy{ - OPT_TRACING_DISABLE_DESTROY, {"tracing/disable_destroy"}, "Disable platform containers destruction.", false}; +static simgrid::config::Flag trace_disable_destroy{OPT_TRACING_DISABLE_DESTROY, + "Disable platform containers destruction.", false}; static simgrid::config::Flag trace_basic{OPT_TRACING_BASIC, "Avoid extended events (impoverished trace file).", false}; @@ -216,24 +215,25 @@ int trace_precision; /************* * Callbacks * *************/ -xbt::signal Container::on_creation; -xbt::signal Container::on_destruction; -xbt::signal Type::on_creation; -xbt::signal LinkType::on_creation; +xbt::signal Container::on_creation; +xbt::signal Container::on_destruction; +xbt::signal Type::on_creation; +xbt::signal LinkType::on_creation; xbt::signal PajeEvent::on_creation; -xbt::signal PajeEvent::on_destruction; -xbt::signal StateEvent::on_destruction; -xbt::signal EntityValue::on_creation; +xbt::signal PajeEvent::on_destruction; +xbt::signal StateEvent::on_destruction; +xbt::signal EntityValue::on_creation; static void on_container_creation_paje(const Container& c) { - double timestamp = SIMIX_get_clock(); + double timestamp = simgrid_get_clock(); std::stringstream stream; - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_CreateContainer, timestamp); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, static_cast(PajeEventType::CreateContainer), + timestamp); - stream << std::fixed << std::setprecision(trace_precision) << PAJE_CreateContainer << " "; - stream << timestamp << " " << c.get_id() << " " << c.type_->get_id() << " " << c.father_->get_id() << " \""; + stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::CreateContainer << " "; + stream << timestamp << " " << c.get_id() << " " << c.get_type()->get_id() << " " << c.get_parent()->get_id() << " \""; if (c.get_name().find("rank-") != 0) stream << c.get_name() << "\""; else @@ -249,22 +249,25 @@ static void on_container_destruction_paje(const Container& c) // 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; - double timestamp = SIMIX_get_clock(); + double timestamp = simgrid_get_clock(); - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_DestroyContainer, timestamp); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, static_cast(PajeEventType::DestroyContainer), + timestamp); - stream << std::fixed << std::setprecision(trace_precision) << PAJE_DestroyContainer << " "; - stream << timestamp << " " << c.type_->get_id() << " " << c.get_id(); + stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::DestroyContainer << " "; + stream << timestamp << " " << c.get_type()->get_id() << " " << c.get_id(); XBT_DEBUG("Dump %s", stream.str().c_str()); tracing_file << stream.str() << std::endl; } } -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()); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, static_cast(PajeEventType::CreateContainer), + simgrid_get_clock()); // if we are in the mode with only one file static std::ofstream* ti_unique_file = nullptr; + static double prefix = 0.0; if (tracing_files.empty()) { // generate unique run id with time @@ -286,7 +289,7 @@ static void on_container_creation_ti(Container& c) tracing_files.insert({&c, ti_unique_file}); } -static void on_container_destruction_ti(Container& c) +static void on_container_destruction_ti(const Container& c) { if (not trace_disable_destroy && &c != Container::get_root()) { if (not simgrid::config::get_value("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) { @@ -300,9 +303,9 @@ static void on_container_destruction_ti(Container& c) static void on_entity_value_creation(const EntityValue& value) { std::stringstream stream; - XBT_DEBUG("%s: event_type=%u", __func__, PAJE_DefineEntityValue); - stream << std::fixed << std::setprecision(trace_precision) << PAJE_DefineEntityValue; - stream << " " << value.get_id() << " " << value.get_father()->get_id() << " " << value.get_name(); + XBT_DEBUG("%s: event_type=%u", __func__, static_cast(PajeEventType::DefineEntityValue)); + stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::DefineEntityValue; + stream << " " << value.get_id() << " " << value.get_parent()->get_id() << " " << value.get_name(); if (not value.get_color().empty()) stream << " \"" << value.get_color() << "\""; XBT_DEBUG("Dump %s", stream.str().c_str()); @@ -311,7 +314,8 @@ static void on_entity_value_creation(const EntityValue& value) static void on_event_creation(PajeEvent& event) { - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, event.eventType_, trace_precision, event.timestamp_); + XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast(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(); @@ -329,15 +333,15 @@ static void on_state_event_destruction(const StateEvent& event) *tracing_files.at(event.get_container()) << event.stream_.str() << std::endl; } -static void on_type_creation(const Type& type, e_event_type event_type) +static void on_type_creation(const Type& type, PajeEventType event_type) { - if (event_type == PAJE_DefineLinkType) + if (event_type == PajeEventType::DefineLinkType) return; // this kind of type has to be handled differently std::stringstream stream; stream << std::fixed << std::setprecision(trace_precision); - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, event_type, trace_precision, 0.); - stream << event_type << " " << type.get_id() << " " << type.get_father()->get_id() << " " << type.get_name(); + XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast(event_type), trace_precision, 0.); + stream << event_type << " " << type.get_id() << " " << type.get_parent()->get_id() << " " << type.get_name(); if (type.is_colored()) stream << " \"" << type.get_color() << "\""; XBT_DEBUG("Dump %s", stream.str().c_str()); @@ -347,8 +351,9 @@ static void on_type_creation(const Type& type, e_event_type event_type) 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.); - stream << PAJE_DefineLinkType << " " << type.get_id() << " " << type.get_father()->get_id(); + XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast(PajeEventType::DefineLinkType), + trace_precision, 0.); + stream << PajeEventType::DefineLinkType << " " << type.get_id() << " " << type.get_parent()->get_id(); stream << " " << source.get_id() << " " << dest.get_id() << " " << type.get_name(); XBT_DEBUG("Dump %s", stream.str().c_str()); tracing_file << stream.str() << std::endl; @@ -379,13 +384,13 @@ static void on_simulation_start() XBT_DEBUG("Filename %s is open for writing", filename.c_str()); if (format == "Paje") { - Container::on_creation.connect(on_container_creation_paje); - Container::on_destruction.connect(on_container_destruction_paje); - 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); + Container::on_creation_cb(on_container_creation_paje); + Container::on_destruction_cb(on_container_destruction_paje); + EntityValue::on_creation_cb(on_entity_value_creation); + Type::on_creation_cb(on_type_creation); + LinkType::on_creation_cb(on_link_type_creation); + PajeEvent::on_creation_cb(on_event_creation); + PajeEvent::on_destruction_cb(on_event_destruction); paje::dump_generator_version(); @@ -399,9 +404,9 @@ static void on_simulation_start() paje::dump_header(trace_basic, TRACE_display_sizes()); } else { 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); + Container::on_creation_cb(on_container_creation_ti); + Container::on_destruction_cb(on_container_destruction_ti); + StateEvent::on_destruction_cb(on_state_event_destruction); } trace_active = true; @@ -414,10 +419,10 @@ static void on_simulation_end() return; /* dump trace buffer */ - last_timestamp_to_dump = surf_get_clock(); + last_timestamp_to_dump = simgrid_get_clock(); dump_buffer(true); - const Type* root_type = Container::get_root()->type_; + const Type* root_type = Container::get_root()->get_type(); /* destroy all data structures of tracing (and free) */ delete Container::get_root(); delete root_type; @@ -450,21 +455,19 @@ void init() config::declare_flag(OPT_TRACING_FORMAT_TI_ONEFILE, "(smpi only) For replay format only : output to one file only", false); - config::alias(OPT_TRACING_FORMAT_TI_ONEFILE, {"tracing/smpi/format/ti_one_file"}); config::declare_flag("tracing/comment", "Add a comment line to the top of the trace file.", ""); config::declare_flag(OPT_TRACING_COMMENT_FILE, "Add the contents of a file as comments to the top of the trace.", ""); - config::alias(OPT_TRACING_COMMENT_FILE, {"tracing/comment_file"}); config::declare_flag("tracing/precision", "Numerical precision used when timestamping events " "(expressed in number of digits after decimal point)", 6); /* Connect Engine callbacks */ - s4u::Engine::on_platform_creation.connect(on_simulation_start); - s4u::Engine::on_time_advance.connect([](double /*time_delta*/) { dump_buffer(false); }); - s4u::Engine::on_deadlock.connect(on_simulation_end); - s4u::Engine::on_simulation_end.connect(on_simulation_end); + s4u::Engine::on_platform_creation_cb(on_simulation_start); + s4u::Engine::on_time_advance_cb([](double /*time_delta*/) { dump_buffer(false); }); + s4u::Engine::on_deadlock_cb(on_simulation_end); + s4u::Engine::on_simulation_end_cb(on_simulation_end); } } // namespace instr } // namespace simgrid