X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0348239c5ae3b76bd1390ab388ac37e27039e91b..96b5e52495fda1471457ea73d533f7fdeed92ddd:/src/instr/instr_config.cpp diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index a1be1875e4..65d5a634d5 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2021. 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. */ @@ -24,7 +24,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"; @@ -37,7 +36,8 @@ 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", + {"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}; @@ -72,8 +72,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}; @@ -218,7 +218,7 @@ int trace_precision; *************/ xbt::signal Container::on_creation; xbt::signal Container::on_destruction; -xbt::signal Type::on_creation; +xbt::signal Type::on_creation; xbt::signal LinkType::on_creation; xbt::signal PajeEvent::on_creation; xbt::signal PajeEvent::on_destruction; @@ -230,9 +230,10 @@ static void on_container_creation_paje(const Container& c) double timestamp = SIMIX_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 << std::fixed << std::setprecision(trace_precision) << PajeEventType::CreateContainer << " "; stream << timestamp << " " << c.get_id() << " " << c.type_->get_id() << " " << c.father_->get_id() << " \""; if (c.get_name().find("rank-") != 0) stream << c.get_name() << "\""; @@ -251,9 +252,10 @@ static void on_container_destruction_paje(const Container& c) std::stringstream stream; double timestamp = SIMIX_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 << std::fixed << std::setprecision(trace_precision) << PajeEventType::DestroyContainer << " "; stream << timestamp << " " << c.type_->get_id() << " " << c.get_id(); XBT_DEBUG("Dump %s", stream.str().c_str()); tracing_file << stream.str() << std::endl; @@ -262,9 +264,11 @@ static void on_container_destruction_paje(const 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), + SIMIX_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 @@ -300,8 +304,8 @@ static void on_container_destruction_ti(const 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; + 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(); if (not value.get_color().empty()) stream << " \"" << value.get_color() << "\""; @@ -311,7 +315,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,14 +334,14 @@ 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.); + 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(); if (type.is_colored()) stream << " \"" << type.get_color() << "\""; @@ -347,8 +352,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_father()->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; @@ -450,11 +456,9 @@ 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)",