'virtual' looks superfluous here.

[simgrid.git] / include / simgrid / instr.h

diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h
index 2a724e7..51ab024 100644 (file)
--- a/include/simgrid/instr.h
+++ b/include/simgrid/instr.h
@@ -14,36 +14,41 @@
 
 namespace simgrid {
 namespace instr {
+/* User-variables related functions*/
+/* for host variables */
 XBT_PUBLIC void declare_host_variable(const std::string& variable, const std::string& color = std::string(""));
-XBT_PUBLIC void set_host_variable(const s4u::Host* host, const std::string& variable, double value,
+XBT_PUBLIC void set_host_variable(const std::string& host, const std::string& variable, double value,
                                   double time = simgrid_get_clock());
-XBT_PUBLIC void add_host_variable(const s4u::Host* host, const std::string& variable, double value,
+XBT_PUBLIC void add_host_variable(const std::string& host, const std::string& variable, double value,
                                   double time = simgrid_get_clock());
-XBT_PUBLIC void sub_host_variable(const s4u::Host* host, const std::string& variable, double value,
+XBT_PUBLIC void sub_host_variable(const std::string& host, const std::string& variable, double value,
                                   double time = simgrid_get_clock());
 XBT_PUBLIC const std::set<std::string, std::less<>>& get_host_variables();
 
+/* for link variables */
 XBT_PUBLIC void declare_link_variable(const std::string& variable, const std::string& color = std::string(""));
-XBT_PUBLIC void set_link_variable(const s4u::Link* link, const std::string& variable, double value,
-                                  double time = simgrid_get_clock());
-XBT_PUBLIC void set_link_variable(const s4u::Host* src, const s4u::Host* dst, const std::string& variable, double value,
-                                  double time = simgrid_get_clock());
-XBT_PUBLIC void add_link_variable(const s4u::Link* link, const std::string& variable, double value,
+XBT_PUBLIC void set_link_variable(const std::string& link, const std::string& variable, double value,
                                   double time = simgrid_get_clock());
-XBT_PUBLIC void add_link_variable(const s4u::Host* src, const s4u::Host* dst, const std::string& variable, double value,
+XBT_PUBLIC void add_link_variable(const std::string& link, const std::string& variable, double value,
                                   double time = simgrid_get_clock());
-XBT_PUBLIC void sub_link_variable(const s4u::Link* link, const std::string& variable, double value,
-                                  double time = simgrid_get_clock());
-XBT_PUBLIC void sub_link_variable(const s4u::Host* src, const s4u::Host* dst, const std::string& variable, double value,
+XBT_PUBLIC void sub_link_variable(const std::string& link, const std::string& variable, double value,
                                   double time = simgrid_get_clock());
+/* for link variables, but with src and dst used for get_route */
+XBT_PUBLIC void set_link_variable(const std::string& src, const std::string& dst, const std::string& variable,
+                                  double value, double time = simgrid_get_clock());
+XBT_PUBLIC void add_link_variable(const std::string& src, const std::string& dst, const std::string& variable,
+                                  double value, double time = simgrid_get_clock());
+XBT_PUBLIC void sub_link_variable(const std::string& src, const std::string& dst, const std::string& variable,
+                                  double value, double time = simgrid_get_clock());
 XBT_PUBLIC const std::set<std::string, std::less<>>& get_link_variables();
 
+/* for VM variables */
 XBT_PUBLIC void declare_vm_variable(const std::string& variable, const std::string& color = std::string(""));
-XBT_PUBLIC void set_vm_variable(const s4u::VirtualMachine* vm, const std::string& variable, double value,
+XBT_PUBLIC void set_vm_variable(const std::string& vm, const std::string& variable, double value,
                                 double time = simgrid_get_clock());
-XBT_PUBLIC void add_vm_variable(const s4u::VirtualMachine* vm, const std::string& variable, double value,
+XBT_PUBLIC void add_vm_variable(const std::string& vm, const std::string& variable, double value,
                                 double time = simgrid_get_clock());
-XBT_PUBLIC void sub_vm_variable(const s4u::VirtualMachine* vm, const std::string& variable, double value,
+XBT_PUBLIC void sub_vm_variable(const std::string& vm, const std::string& variable, double value,
                                 double time = simgrid_get_clock());
 XBT_PUBLIC const std::set<std::string, std::less<>>& get_vm_variables();
 
@@ -68,18 +73,6 @@ SG_BEGIN_DECL
 /* Functions to manage tracing categories */
 XBT_PUBLIC void TRACE_smpi_set_category(const char* category);
 
-/* User-variables related functions*/
-/* for VM variables */
-XBT_PUBLIC void TRACE_vm_variable_set(const char* vm, const char* variable, double value);
-/* for host variables */
-XBT_PUBLIC void TRACE_host_variable_set(const char* host, const char* variable, double value);
-XBT_PUBLIC void TRACE_host_variable_add(const char* host, const char* variable, double value);
-XBT_PUBLIC void TRACE_host_variable_sub(const char* host, const char* variable, double value);
-/* for link variables */
-XBT_PUBLIC void TRACE_link_variable_set(const char* link, const char* variable, double value);
-/* for link variables, but with src and dst used for get_route */
-XBT_PUBLIC void TRACE_link_srcdst_variable_set(const char* src, const char* dst, const char* variable, double value);
-
 XBT_PUBLIC void TRACE_host_state_declare(const char* state);
 XBT_PUBLIC void TRACE_host_state_declare_value(const char* state, const char* value, const char* color);
 XBT_PUBLIC void TRACE_host_set_state(const char* host, const char* state, const char* value);
@@ -107,11 +100,13 @@ XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_vm_variable") XBT
     void TRACE_vm_variable_declare(const char* variable);
 XBT_ATTRIB_DEPRECATED_v333("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
+    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
     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
     void TRACE_vm_variable_sub(const char* vm, const char* variable, double value);
-XBT_ATTRIB_DEPRECATED_v333("Please use TRACE_vm_variable_set") XBT_PUBLIC
+XBT_ATTRIB_DEPRECATED_v333("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
     void TRACE_vm_variable_add_with_time(double time, const char* vm, const char* variable, double value);
@@ -121,7 +116,13 @@ XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_host_variable") X
     void TRACE_host_variable_declare(const char* variable);
 XBT_ATTRIB_DEPRECATED_v333("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 TRACE_host_variable_set") XBT_PUBLIC
+XBT_ATTRIB_DEPRECATED_v333("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
+    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
+    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
     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
     void TRACE_host_variable_add_with_time(double time, const char* host, const char* variable, double value);
@@ -133,17 +134,21 @@ XBT_ATTRIB_DEPRECATED_v333("Please use simgrid::instr::declare_link_variable") X
     void TRACE_link_variable_declare(const char* var);
 XBT_ATTRIB_DEPRECATED_v333("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
+    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
     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
     void TRACE_link_variable_sub(const char* link, const char* variable, double value);
-XBT_ATTRIB_DEPRECATED_v333("Please use TRACE_link_variable_set") XBT_PUBLIC
+XBT_ATTRIB_DEPRECATED_v333("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
     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
     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
+    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
     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