X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b570efb92a5785e2283c9116869e8773e03a3f81..8ee33e91b51a3da554a097f6eb3927b74a1ea903:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 9c8da06579..106acd4c31 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2022. 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. */ @@ -17,11 +17,11 @@ enum class InstrUserVariable { DECLARE, SET, ADD, SUB }; XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API"); -std::set> created_categories; -std::set> declared_marks; -std::set> user_host_variables; -std::set> user_vm_variables; -std::set> user_link_variables; +static std::set> created_categories; +static std::set> declared_marks; +static std::set> user_host_variables; +static std::set> user_vm_variables; +static std::set> user_link_variables; static void instr_user_variable(double time, const std::string& resource, const std::string& variable_name, const std::string& parent_type, double value, InstrUserVariable what, @@ -62,7 +62,7 @@ static void instr_user_variable(double time, const std::string& resource, const static void instr_user_srcdst_variable(double time, const std::string& src, const std::string& dst, const std::string& variable, double value, InstrUserVariable what) { - auto* engine = simgrid::s4u::Engine::get_instance(); + const auto* engine = simgrid::s4u::Engine::get_instance(); const auto* src_elm = engine->netpoint_by_name_or_null(src); xbt_assert(src_elm, "Element '%s' not found!", src.c_str()); @@ -75,8 +75,7 @@ static void instr_user_srcdst_variable(double time, const std::string& src, cons instr_user_variable(time, link->get_cname(), variable, "LINK", value, what, "", &user_link_variables); } -namespace simgrid { -namespace instr { +namespace simgrid::instr { /* for host variables */ /** @brief Declare a new user variable associated to hosts. * @@ -313,7 +312,7 @@ void declare_tracing_category(const std::string& name, const std::string& color) double blue = simgrid::xbt::random::uniform_real(0.0, std::nextafter(1.0, 2.0)); final_color = std::to_string(red) + " " + std::to_string(green) + " " + std::to_string(blue); } else { - final_color = std::string(color); + final_color = color; } XBT_DEBUG("CAT,declare %s, \"%s\" \"%s\"", name.c_str(), color.c_str(), final_color.c_str()); @@ -331,10 +330,9 @@ const std::set>& get_tracing_categories() return created_categories; } -} // namespace instr -} // namespace simgrid +} // namespace simgrid::instr -static xbt_dynar_t instr_set_to_dynar(const std::set>& filter) // XBT_ATTRIB_DEPRECATED_v333 +static xbt_dynar_t instr_set_to_dynar(const std::set>& filter) // XBT_ATTRIB_DEPRECATED_v334 { if (not TRACE_is_enabled() || not TRACE_needs_platform()) return nullptr; @@ -346,45 +344,45 @@ static xbt_dynar_t instr_set_to_dynar(const std::set>& return ret; } -void TRACE_category(const char* category) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_category(const char* category) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_tracing_category(category); } -void TRACE_category_with_color(const char* category, const char* color) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_category_with_color(const char* category, const char* color) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_tracing_category(category, color); } -xbt_dynar_t TRACE_get_categories() // XBT_ATTRIB_DEPRECATED_v333 +xbt_dynar_t TRACE_get_categories() // XBT_ATTRIB_DEPRECATED_v334 { if (not TRACE_is_enabled() || not TRACE_categorized()) return nullptr; return instr_set_to_dynar(created_categories); } -void TRACE_declare_mark(const char* mark_type) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_declare_mark(const char* mark_type) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_mark(mark_type); } void TRACE_declare_mark_value_with_color(const char* mark_type, const char* mark_value, - const char* mark_color) // XBT_ATTRIB_DEPRECATED_v333 + const char* mark_color) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_mark_value(mark_type, mark_value, mark_color); } -void TRACE_declare_mark_value(const char* mark_type, const char* mark_value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_declare_mark_value(const char* mark_type, const char* mark_value) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_mark_value(mark_type, mark_value); } -void TRACE_mark(const char* mark_type, const char* mark_value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_mark(const char* mark_type, const char* mark_value) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::mark(mark_type, mark_value); } -xbt_dynar_t TRACE_get_marks() // XBT_ATTRIB_DEPRECATED_v333 +xbt_dynar_t TRACE_get_marks() // XBT_ATTRIB_DEPRECATED_v334 { if (not TRACE_is_enabled()) return nullptr; @@ -392,186 +390,186 @@ xbt_dynar_t TRACE_get_marks() // XBT_ATTRIB_DEPRECATED_v333 return instr_set_to_dynar(declared_marks); } -int TRACE_platform_graph_export_graphviz(const char* filename) // XBT_ATTRIB_DEPRECATED_v333 +int TRACE_platform_graph_export_graphviz(const char* filename) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::platform_graph_export_graphviz(filename); return 1; } -void TRACE_vm_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_vm_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v334 { - instr_user_variable(0, nullptr, variable, "VM", 0, InstrUserVariable::DECLARE, "", &user_vm_variables); + instr_user_variable(0, "", variable, "VM", 0, InstrUserVariable::DECLARE, "", &user_vm_variables); } -void TRACE_vm_variable_declare_with_color(const char* variable, const char* color) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_vm_variable_declare_with_color(const char* variable, const char* color) // XBT_ATTRIB_DEPRECATED_v334 { - instr_user_variable(0, nullptr, variable, "VM", 0, InstrUserVariable::DECLARE, color, &user_vm_variables); + instr_user_variable(0, "", variable, "VM", 0, InstrUserVariable::DECLARE, color, &user_vm_variables); } -void TRACE_vm_variable_set(const char* vm, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_vm_variable_set(const char* vm, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), vm, variable, "VM", value, InstrUserVariable::SET, "", &user_vm_variables); } -void TRACE_vm_variable_add(const char* vm, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_vm_variable_add(const char* vm, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), vm, variable, "VM", value, InstrUserVariable::ADD, "", &user_vm_variables); } -void TRACE_vm_variable_sub(const char* vm, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_vm_variable_sub(const char* vm, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), vm, variable, "VM", value, InstrUserVariable::SUB, "", &user_vm_variables); } void TRACE_vm_variable_set_with_time(double time, const char* vm, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SET, "", &user_vm_variables); } void TRACE_vm_variable_add_with_time(double time, const char* vm, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::ADD, "", &user_vm_variables); } void TRACE_vm_variable_sub_with_time(double time, const char* vm, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SUB, "", &user_vm_variables); } -void TRACE_host_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_host_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_host_variable(variable); } -void TRACE_host_variable_declare_with_color(const char* variable, const char* color) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_host_variable_declare_with_color(const char* variable, const char* color) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_host_variable(variable, color); } -void TRACE_host_variable_set(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_host_variable_set(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), host, variable, "HOST", value, InstrUserVariable::SET, "", &user_host_variables); } -void TRACE_host_variable_add(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_host_variable_add(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), host, variable, "HOST", value, InstrUserVariable::ADD, "", &user_host_variables); } -void TRACE_host_variable_sub(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_host_variable_sub(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), host, variable, "HOST", value, InstrUserVariable::SUB, "", &user_host_variables); } void TRACE_host_variable_set_with_time(double time, const char* host, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, host, variable, "HOST", value, InstrUserVariable::SET, "", &user_host_variables); } void TRACE_host_variable_add_with_time(double time, const char* host, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, host, variable, "HOST", value, InstrUserVariable::ADD, "", &user_host_variables); } void TRACE_host_variable_sub_with_time(double time, const char* host, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, host, variable, "HOST", value, InstrUserVariable::SUB, "", &user_host_variables); } -xbt_dynar_t TRACE_get_host_variables() // XBT_ATTRIB_DEPRECATED_v333 +xbt_dynar_t TRACE_get_host_variables() // XBT_ATTRIB_DEPRECATED_v334 { return instr_set_to_dynar(user_host_variables); } -void TRACE_link_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_link_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_link_variable(variable); } -void TRACE_link_variable_declare_with_color(const char* variable, const char* color) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_link_variable_declare_with_color(const char* variable, const char* color) // XBT_ATTRIB_DEPRECATED_v334 { simgrid::instr::declare_link_variable(variable, color); } -void TRACE_link_variable_set(const char* link, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_link_variable_set(const char* link, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), link, variable, "LINK", value, InstrUserVariable::SET, "", &user_link_variables); } -void TRACE_link_variable_add(const char* link, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_link_variable_add(const char* link, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), link, variable, "LINK", value, InstrUserVariable::ADD, "", &user_link_variables); } -void TRACE_link_variable_sub(const char* link, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333 +void TRACE_link_variable_sub(const char* link, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(simgrid_get_clock(), link, variable, "LINK", value, InstrUserVariable::SUB, "", &user_link_variables); } void TRACE_link_variable_set_with_time(double time, const char* link, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, link, variable, "LINK", value, InstrUserVariable::SET, "", &user_link_variables); } void TRACE_link_variable_add_with_time(double time, const char* link, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, link, variable, "LINK", value, InstrUserVariable::ADD, "", &user_link_variables); } void TRACE_link_variable_sub_with_time(double time, const char* link, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_variable(time, link, variable, "LINK", value, InstrUserVariable::SUB, "", &user_link_variables); } void TRACE_link_srcdst_variable_set(const char* src, const char* dst, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_srcdst_variable(simgrid_get_clock(), src, dst, variable, value, InstrUserVariable::SET); } void TRACE_link_srcdst_variable_add(const char* src, const char* dst, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_srcdst_variable(simgrid_get_clock(), src, dst, variable, value, InstrUserVariable::ADD); } void TRACE_link_srcdst_variable_sub(const char* src, const char* dst, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_srcdst_variable(simgrid_get_clock(), src, dst, variable, value, InstrUserVariable::SUB); } void TRACE_link_srcdst_variable_set_with_time(double time, const char* src, const char* dst, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::SET); } void TRACE_link_srcdst_variable_add_with_time(double time, const char* src, const char* dst, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::ADD); } void TRACE_link_srcdst_variable_sub_with_time(double time, const char* src, const char* dst, const char* variable, - double value) // XBT_ATTRIB_DEPRECATED_v333 + double value) // XBT_ATTRIB_DEPRECATED_v334 { instr_user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::SUB); } -xbt_dynar_t TRACE_get_link_variables() // XBT_ATTRIB_DEPRECATED_v333 +xbt_dynar_t TRACE_get_link_variables() // XBT_ATTRIB_DEPRECATED_v334 { return instr_set_to_dynar(user_link_variables); } @@ -617,7 +615,7 @@ void TRACE_host_state_declare_value (const char *state, const char *value, const * @param state_name The name of the state previously declared. * @param value_name The new value of the state. * - * @see TRACE_host_state_declare, TRACE_host_push_state, TRACE_host_pop_state, TRACE_host_reset_state + * @see TRACE_host_state_declare, TRACE_host_push_state, TRACE_host_pop_state */ void TRACE_host_set_state(const char* host, const char* state_name, const char* value_name) { @@ -635,7 +633,7 @@ void TRACE_host_set_state(const char* host, const char* state_name, const char* * @param state_name The name of the state previously declared. * @param value_name The value to be pushed. * - * @see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_pop_state, TRACE_host_reset_state + * @see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_pop_state */ void TRACE_host_push_state(const char* host, const char* state_name, const char* value_name) { @@ -650,7 +648,7 @@ void TRACE_host_push_state(const char* host, const char* state_name, const char* * @param host The name of the host to be considered. * @param state_name The name of the state to be popped. * - * @see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_push_state, TRACE_host_reset_state + * @see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_push_state */ void TRACE_host_pop_state(const char* host, const char* state_name) {