From c6f2914980450d19e7b47590a88698bb2b30e5c6 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 17 Jan 2022 15:49:14 +0100 Subject: [PATCH] Current XBT_ATTRIB_DEPRECATED is v334. Fix last changes. --- include/simgrid/instr.h | 82 +++++++++++++++++----------------- src/instr/instr_interface.cpp | 84 +++++++++++++++++------------------ 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h index 51ab024399..b44eaf3305 100644 --- a/include/simgrid/instr.h +++ b/include/simgrid/instr.h @@ -79,90 +79,90 @@ XBT_PUBLIC void TRACE_host_set_state(const char* host, const char* state, const XBT_PUBLIC void TRACE_host_push_state(const char* host, const char* state, const char* value); XBT_PUBLIC void TRACE_host_pop_state(const char* host, const char* state); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::platform_graph_export_graphviz") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::platform_graph_export_graphviz") XBT_PUBLIC int TRACE_platform_graph_export_graphviz(const char* filename); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_tracing_category") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_tracing_category") XBT_PUBLIC void TRACE_category(const char* category); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_tracing_category") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_tracing_category") XBT_PUBLIC void TRACE_category_with_color(const char* category, const char* color); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::get_tracing_categories") XBT_PUBLIC xbt_dynar_t +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::get_tracing_categories") XBT_PUBLIC xbt_dynar_t TRACE_get_categories(); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_mark") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_mark") XBT_PUBLIC void TRACE_declare_mark(const char* mark_type); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_mark_value") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_mark_value") XBT_PUBLIC void TRACE_declare_mark_value_with_color(const char* mark_type, const char* mark_value, const char* mark_color); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_mark_value") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_mark_value") XBT_PUBLIC void TRACE_declare_mark_value(const char* mark_type, const char* mark_value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::mark") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::mark") XBT_PUBLIC void TRACE_mark(const char* mark_type, const char* mark_value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::get_marks") XBT_PUBLIC xbt_dynar_t TRACE_get_marks(); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_vm_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::get_marks") XBT_PUBLIC xbt_dynar_t TRACE_get_marks(); +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_vm_variable") XBT_PUBLIC void TRACE_vm_variable_declare(const char* variable); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_vm_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_vm_variable") XBT_PUBLIC void TRACE_vm_variable_declare_with_color(const char* variable, const char* color); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::set_vm_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::set_vm_variable") XBT_PUBLIC void TRACE_vm_variable_set(const char* vm, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::add_vm_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::add_vm_variable") XBT_PUBLIC void TRACE_vm_variable_add(const char* vm, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::sub_vm_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::sub_vm_variable") XBT_PUBLIC void TRACE_vm_variable_sub(const char* vm, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::set_vm_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::set_vm_variable") XBT_PUBLIC void TRACE_vm_variable_set_with_time(double time, const char* vm, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::add_vm_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::add_vm_variable") XBT_PUBLIC void TRACE_vm_variable_add_with_time(double time, const char* vm, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::sub_vm_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::sub_vm_variable") XBT_PUBLIC void TRACE_vm_variable_sub_with_time(double time, const char* vm, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_host_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_host_variable") XBT_PUBLIC void TRACE_host_variable_declare(const char* variable); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_host_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_host_variable") XBT_PUBLIC void TRACE_host_variable_declare_with_color(const char* variable, const char* color); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::set_host_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::set_host_variable") XBT_PUBLIC void TRACE_host_variable_set(const char* host, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::add_host_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::add_host_variable") XBT_PUBLIC void TRACE_host_variable_add(const char* host, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::sub_host_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::sub_host_variable") XBT_PUBLIC void TRACE_host_variable_sub(const char* host, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::set_host_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::set_host_variable") XBT_PUBLIC void TRACE_host_variable_set_with_time(double time, const char* host, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::add_host_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::add_host_variable") XBT_PUBLIC void TRACE_host_variable_add_with_time(double time, const char* host, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::sub_host_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::sub_host_variable") XBT_PUBLIC void TRACE_host_variable_sub_with_time(double time, const char* host, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::get_host_variables") XBT_PUBLIC xbt_dynar_t +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::get_host_variables") XBT_PUBLIC xbt_dynar_t TRACE_get_host_variables(); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_link_variable") XBT_PUBLIC void TRACE_link_variable_declare(const char* var); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::declare_link_variable") XBT_PUBLIC void TRACE_link_variable_declare_with_color(const char* var, const char* color); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::set_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::set_link_variable") XBT_PUBLIC void TRACE_link_variable_set(const char* link, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::add_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::add_link_variable") XBT_PUBLIC void TRACE_link_variable_add(const char* link, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::sub_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::sub_link_variable") XBT_PUBLIC void TRACE_link_variable_sub(const char* link, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::set_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::set_link_variable") XBT_PUBLIC void TRACE_link_variable_set_with_time(double time, const char* link, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::add_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::add_link_variable") XBT_PUBLIC void TRACE_link_variable_add_with_time(double time, const char* link, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::sub_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::sub_link_variable") XBT_PUBLIC void TRACE_link_variable_sub_with_time(double time, const char* link, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::set_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::set_link_variable") XBT_PUBLIC void TRACE_link_srcdst_variable_set(const char* src, const char* dst, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::add_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::add_link_variable") XBT_PUBLIC void TRACE_link_srcdst_variable_add(const char* src, const char* dst, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr:sub_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr:sub_link_variable") XBT_PUBLIC void TRACE_link_srcdst_variable_sub(const char* src, const char* dst, const char* variable, double value); -XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::set_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::set_link_variable") XBT_PUBLIC 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("Please use simgrid::instr::add_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::add_link_variable") XBT_PUBLIC 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("Please use simgrid::instr:sub_link_variable") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr:sub_link_variable") XBT_PUBLIC 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("Please use simgrid::instr::get_link_variables") XBT_PUBLIC xbt_dynar_t +XBT_ATTRIB_DEPRECATED_v334("Please use simgrid::instr::get_link_variables") XBT_PUBLIC xbt_dynar_t TRACE_get_link_variables(); SG_END_DECL diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index e88c3e0da5..20a9c897a0 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -334,7 +334,7 @@ const std::set>& get_tracing_categories() } // namespace instr } // namespace simgrid -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 +346,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 +392,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, "", 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, "", 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); } -- 2.20.1