X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7212601385a2db12e1ee3d0a06084cd383702c79..5ec2b80b686983f84ebab7c7398a29e73286deee:/src/instr/instr_config.cpp diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 11dce17f90..19d9e9eb22 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -1,19 +1,16 @@ -/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2023. 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 -#include // _mkdir -#endif #include #include @@ -24,7 +21,6 @@ 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 constexpr char OPT_TRACING_BASIC[] = "tracing/basic"; constexpr char OPT_TRACING_COMMENT_FILE[] = "tracing/comment-file"; @@ -38,7 +34,6 @@ static simgrid::config::Flag trace_enabled{ static simgrid::config::Flag trace_actor_enabled{ "tracing/actor", - {"tracing/msg/process"}, // XBT_ATTRIB_DEPRECATED_v330(option alias) "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}; @@ -73,8 +68,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}; @@ -208,8 +203,7 @@ void TRACE_help() " within the same Autonomous System (AS)."); } -namespace simgrid { -namespace instr { +namespace simgrid::instr { static bool trace_active = false; TraceFormat trace_format = TraceFormat::Paje; int trace_precision; @@ -228,14 +222,14 @@ 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__, static_cast(PajeEventType::CreateContainer), timestamp); stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::CreateContainer << " "; - stream << timestamp << " " << c.get_id() << " " << c.type_->get_id() << " " << c.father_->get_id() << " \""; + 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 @@ -243,7 +237,7 @@ static void on_container_creation_paje(const Container& c) stream << "rank-" << stoi(c.get_name().substr(5)) - 1 << "\""; XBT_DEBUG("Dump %s", stream.str().c_str()); - tracing_file << stream.str() << std::endl; + tracing_file << stream.str() << '\n'; } static void on_container_destruction_paje(const Container& c) @@ -251,24 +245,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__, static_cast(PajeEventType::DestroyContainer), timestamp); stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::DestroyContainer << " "; - stream << timestamp << " " << c.type_->get_id() << " " << c.get_id(); + stream << timestamp << " " << c.get_type()->get_id() << " " << c.get_id(); XBT_DEBUG("Dump %s", stream.str().c_str()); - tracing_file << stream.str() << std::endl; + tracing_file << stream.str() << '\n'; } } static void on_container_creation_ti(const Container& c) { XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, static_cast(PajeEventType::CreateContainer), - SIMIX_get_clock()); + 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 @@ -278,14 +273,10 @@ static void on_container_creation_ti(const Container& c) if (not simgrid::config::get_value("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) { std::string folder_name = simgrid::config::get_value("tracing/filename") + "_files"; std::string filename = folder_name + "/" + std::to_string(prefix) + "_" + c.get_name() + ".txt"; -#ifdef WIN32 - _mkdir(folder_name.c_str()); -#else - mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); -#endif + mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); ti_unique_file = new std::ofstream(filename.c_str(), std::ofstream::out); xbt_assert(not ti_unique_file->fail(), "Tracefile %s could not be opened for writing", filename.c_str()); - tracing_file << filename << std::endl; + tracing_file << filename << '\n'; } tracing_files.insert({&c, ti_unique_file}); } @@ -306,11 +297,11 @@ static void on_entity_value_creation(const EntityValue& value) std::stringstream stream; 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_father()->get_id() << " " << value.get_name(); + 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()); - tracing_file << stream.str() << std::endl; + tracing_file << stream.str() << '\n'; } static void on_event_creation(PajeEvent& event) @@ -325,13 +316,13 @@ static void on_event_creation(PajeEvent& event) static void on_event_destruction(const PajeEvent& event) { XBT_DEBUG("Dump %s", event.stream_.str().c_str()); - tracing_file << event.stream_.str() << std::endl; + tracing_file << event.stream_.str() << '\n'; } static void on_state_event_destruction(const StateEvent& event) { if (event.has_extra()) - *tracing_files.at(event.get_container()) << event.stream_.str() << std::endl; + *tracing_files.at(event.get_container()) << event.stream_.str() << '\n'; } static void on_type_creation(const Type& type, PajeEventType event_type) @@ -342,11 +333,11 @@ static void on_type_creation(const Type& type, PajeEventType event_type) std::stringstream stream; stream << std::fixed << std::setprecision(trace_precision); XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast(event_type), trace_precision, 0.); - stream << event_type << " " << type.get_id() << " " << type.get_father()->get_id() << " " << type.get_name(); + 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()); - tracing_file << stream.str() << std::endl; + tracing_file << stream.str() << '\n'; } static void on_link_type_creation(const Type& type, const Type& source, const Type& dest) @@ -354,10 +345,10 @@ static void on_link_type_creation(const Type& type, const Type& source, const Ty std::stringstream stream; XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast(PajeEventType::DefineLinkType), trace_precision, 0.); - stream << PajeEventType::DefineLinkType << " " << type.get_id() << " " << type.get_father()->get_id(); + 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; + tracing_file << stream.str() << '\n'; } static void on_simulation_start() @@ -385,29 +376,28 @@ 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(); /* output one line comment */ - std::string comment = simgrid::config::get_value("tracing/comment"); - if (not comment.empty()) - tracing_file << "# " << comment << std::endl; + if (auto comment = simgrid::config::get_value("tracing/comment"); not comment.empty()) + tracing_file << "# " << comment << '\n'; /* output comment file */ paje::dump_comment_file(config::get_value(OPT_TRACING_COMMENT_FILE)); 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; @@ -420,10 +410,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; @@ -456,21 +446,18 @@ 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 +} // namespace simgrid::instr