continue the deprecation of instrumentation C interface

Revert some previous changes as they caused many too conversions
(object->name->object->name) in the Java world even though the old Java
MSG interface is next on the chopping list ;)

diff --git a/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp b/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp
index d650f55..75cab99 100644 (file)
--- a/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp
+++ b/examples/cpp/trace-host-user-variables/s4u-trace-host-user-variables.cpp
@@ -15,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example")
 
 static void trace_fun()
 {
-  const auto* host = simgrid::s4u::this_actor::get_host();
+  const auto host = simgrid::s4u::this_actor::get_host()->get_name();
 
   // the hostname has an empty HDD with a capacity of 100000 (bytes)
   simgrid::instr::set_host_variable(host, "HDD_capacity", 100000);

diff --git a/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp b/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp
index 48c1d9a..179afd5 100644 (file)
--- a/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp
+++ b/examples/cpp/trace-link-user-variables/s4u-trace-link-user-variables.cpp
@@ -15,31 +15,29 @@ static void trace_fun()
 {
   // set initial values for the link user variables this example only shows for links identified by "6" and "3" in the
   // platform file
-  const auto* link_3 = simgrid::s4u::Link::by_name("3");
-  const auto* link_6 = simgrid::s4u::Link::by_name("6");
   // Set the Link_Capacity variable
-  simgrid::instr::set_link_variable(link_6, "Link_Capacity", 12.34);
-  simgrid::instr::set_link_variable(link_3, "Link_Capacity", 56.78);
+  simgrid::instr::set_link_variable("6", "Link_Capacity", 12.34);
+  simgrid::instr::set_link_variable("3", "Link_Capacity", 56.78);
 
   // Set the Link_Utilization variable
-  simgrid::instr::set_link_variable(link_3, "Link_Utilization", 1.2);
-  simgrid::instr::set_link_variable(link_6, "Link_Utilization", 3.4);
+  simgrid::instr::set_link_variable("3", "Link_Utilization", 1.2);
+  simgrid::instr::set_link_variable("6", "Link_Utilization", 3.4);
 
   // run the simulation, update my variables accordingly
   for (int i = 0; i < 10; i++) {
     simgrid::s4u::this_actor::execute(1e6);
 
     // Add to link user variables
-    simgrid::instr::add_link_variable(link_3, "Link_Utilization", 5.6);
-    simgrid::instr::add_link_variable(link_6, "Link_Utilization", 7.8);
+    simgrid::instr::add_link_variable("3", "Link_Utilization", 5.6);
+    simgrid::instr::add_link_variable("6", "Link_Utilization", 7.8);
   }
 
   for (int i = 0; i < 10; i++) {
     simgrid::s4u::this_actor::execute(1e6);
 
     // Subtract from link user variables
-    simgrid::instr::sub_link_variable(link_3, "Link_Utilization", 3.4);
-    simgrid::instr::sub_link_variable(link_6, "Link_Utilization", 5.6);
+    simgrid::instr::sub_link_variable("3", "Link_Utilization", 3.4);
+    simgrid::instr::sub_link_variable("6", "Link_Utilization", 5.6);
   }
 }
 

diff --git a/examples/cpp/trace-masterworkers/s4u-trace-masterworkers.cpp b/examples/cpp/trace-masterworkers/s4u-trace-masterworkers.cpp
index 2e130e0..e7c6f87 100644 (file)
--- a/examples/cpp/trace-masterworkers/s4u-trace-masterworkers.cpp
+++ b/examples/cpp/trace-masterworkers/s4u-trace-masterworkers.cpp
@@ -22,7 +22,7 @@ static void master(std::vector<std::string> args)
   double compute_cost     = std::stod(args[2]);
   long communication_cost = std::stol(args[3]);
   size_t workers_count    = args.size() - 4;
-  const auto* my_host     = simgrid::s4u::this_actor::get_host();
+  const auto& my_host     = simgrid::s4u::this_actor::get_host()->get_name();
   auto mailbox            = simgrid::s4u::Mailbox::by_name("master_mailbox");
 
   XBT_DEBUG("Got %zu workers and %ld tasks to process", workers_count, tasks_count);
@@ -52,7 +52,7 @@ static void worker(std::vector<std::string> args)
 {
   xbt_assert(args.size() == 1, "The worker expects no argument");
 
-  auto my_host = simgrid::s4u::this_actor::get_host();
+  const auto& my_host = simgrid::s4u::this_actor::get_host()->get_name();
   auto mailbox = simgrid::s4u::Mailbox::by_name("master_mailbox");
 
   simgrid::instr::set_host_variable(my_host, "is_worker", 1);

diff --git a/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp b/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp
index 53a11ce..06c27b6 100644 (file)
--- a/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp
+++ b/examples/cpp/trace-route-user-variables/s4u-trace-route-user-variables.cpp
@@ -15,38 +15,33 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example")
 
 static void trace_fun()
 {
-  auto bourassa = simgrid::s4u::Host::by_name("Bourassa");
-  auto fafard   = simgrid::s4u::Host::by_name("Fafard");
-  auto ginette  = simgrid::s4u::Host::by_name("Ginette");
-  auto tremblay = simgrid::s4u::Host::by_name("Tremblay");
-
   // Set initial values for the link user variables
   // This example uses source and destination where source and destination are the name of hosts in the platform file.
   // The functions will set/change the value of the variable for all links in the route between source and destination.
 
   // Set the Link_Capacity variable
-  simgrid::instr::set_link_variable(tremblay, bourassa, "Link_Capacity", 12.34);
-  simgrid::instr::set_link_variable(fafard, ginette, "Link_Capacity", 56.78);
+  simgrid::instr::set_link_variable("Tremblay", "Bourassa", "Link_Capacity", 12.34);
+  simgrid::instr::set_link_variable("Fafard", "Ginette", "Link_Capacity", 56.78);
 
   // Set the Link_Utilization variable
-  simgrid::instr::set_link_variable(tremblay, bourassa, "Link_Utilization", 1.2);
-  simgrid::instr::set_link_variable(fafard, ginette, "Link_Utilization", 3.4);
+  simgrid::instr::set_link_variable("Tremblay", "Bourassa", "Link_Utilization", 1.2);
+  simgrid::instr::set_link_variable("Fafard", "Ginette", "Link_Utilization", 3.4);
 
   // run the simulation, update my variables accordingly
   for (int i = 0; i < 10; i++) {
     simgrid::s4u::this_actor::execute(1e6);
 
     // Add to link user variables
-    simgrid::instr::add_link_variable(tremblay, bourassa, "Link_Utilization", 5.6);
-    simgrid::instr::add_link_variable(fafard, ginette, "Link_Utilization", 7.8);
+    simgrid::instr::add_link_variable("Tremblay", "Bourassa", "Link_Utilization", 5.6);
+    simgrid::instr::add_link_variable("Fafard", "Ginette", "Link_Utilization", 7.8);
   }
 
   for (int i = 0; i < 10; i++) {
     simgrid::s4u::this_actor::execute(1e6);
 
     // Subtract from link user variables
-    simgrid::instr::sub_link_variable(tremblay, bourassa, "Link_Utilization", 3.4);
-    simgrid::instr::sub_link_variable(fafard, ginette, "Link_Utilization", 5.6);
+    simgrid::instr::sub_link_variable("Tremblay", "Bourassa", "Link_Utilization", 3.4);
+    simgrid::instr::sub_link_variable("Fafard", "Ginette", "Link_Utilization", 5.6);
   }
 }
 

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

diff --git a/src/bindings/java/jtrace.cpp b/src/bindings/java/jtrace.cpp
index a2166cb..bcfa768 100644 (file)
--- a/src/bindings/java/jtrace.cpp
+++ b/src/bindings/java/jtrace.cpp
@@ -69,31 +69,31 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare(JNIEnv*
   simgrid::instr::declare_host_variable(variable);
 }
 
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet (JNIEnv *env, jclass cls, jstring js_host,
-                                                                     jstring js_state, jdouble value)
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet(JNIEnv* env, jclass cls, jstring js_host,
+                                                                    jstring js_variable, jdouble value)
 {
   jstring_wrapper host(env, js_host);
-  jstring_wrapper state(env, js_state);
+  jstring_wrapper variable(env, js_variable);
 
-  TRACE_host_variable_set(host, state, value);
+  simgrid::instr::set_host_variable(host, variable, value);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd(JNIEnv* env, jclass cls, jstring js_host,
-                                                                    jstring js_state, jdouble value)
+                                                                    jstring js_variable, jdouble value)
 {
   jstring_wrapper host(env, js_host);
-  jstring_wrapper state(env, js_state);
+  jstring_wrapper variable(env, js_variable);
 
-  TRACE_host_variable_add(host, state, value);
+  simgrid::instr::add_host_variable(host, variable, value);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub(JNIEnv* env, jclass cls, jstring js_host,
-                                                                    jstring js_state, jdouble value)
+                                                                    jstring js_variable, jdouble value)
 {
   jstring_wrapper host(env, js_host);
-  jstring_wrapper state(env, js_state);
+  jstring_wrapper variable(env, js_variable);
 
-  TRACE_host_variable_sub(host, state, value);
+  simgrid::instr::sub_host_variable(host, variable, value);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare(JNIEnv* env, jclass cls, jstring js_variable)
@@ -102,13 +102,13 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare(JNIEnv* en
   simgrid::instr::declare_vm_variable(variable);
 }
 
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *env, jclass cls, jstring js_vm,
-                                                                   jstring js_state, jdouble value)
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet(JNIEnv* env, jclass cls, jstring js_vm,
+                                                                  jstring js_variable, jdouble value)
 {
   jstring_wrapper vm(env, js_vm);
-  jstring_wrapper state(env, js_state);
+  jstring_wrapper variable(env, js_variable);
 
-  TRACE_vm_variable_set(vm, state, value);
+  simgrid::instr::set_vm_variable(vm, variable, value);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclare (JNIEnv *env, jclass cls, jstring jvar) {
@@ -121,16 +121,19 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclareWithColor
   jstring_wrapper color(env, jcolor);
   simgrid::instr::declare_link_variable(variable, color);
 }
+
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSet (JNIEnv *env, jclass cls, jstring jlink, jstring jvar, jdouble jvalue) {
   jstring_wrapper link(env, jlink);
   jstring_wrapper variable(env, jvar);
-  TRACE_link_variable_set(link, variable, jvalue);
+  simgrid::instr::set_link_variable(link, variable, jvalue);
 }
+
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSet
   (JNIEnv *env, jclass cls, jstring jsrc, jstring jdst, jstring jvar, jdouble jval)
 {
   jstring_wrapper src(env, jsrc);
   jstring_wrapper dst(env, jdst);
+
   jstring_wrapper variable(env, jvar);
-  TRACE_link_srcdst_variable_set(src, dst, variable, jval);
+  simgrid::instr::set_link_variable(src, dst, variable, jval);
 }

diff --git a/src/bindings/java/jtrace.h b/src/bindings/java/jtrace.h
index 0cd1220..626d40d 100644 (file)
--- a/src/bindings/java/jtrace.h
+++ b/src/bindings/java/jtrace.h
@@ -23,7 +23,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare (JNIEnv *env, jclass cls, jstring jvar);
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare (JNIEnv *env, jclass cls, jstring jvar);
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclareWithColor (JNIEnv *env, jclass cls, jstring jvar,
@@ -61,16 +60,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPushState (JNIEnv *env,
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPopState (JNIEnv *env, jclass cls, jstring js_host,
                                                                   jstring js_state);
 
-/* Missing calls:
-Java_org_simgrid_trace_Trace_linkVariableSetWithTime
-Java_org_simgrid_trace_Trace_linkVariableAddWithTime
-Java_org_simgrid_trace_Trace_linkVariableSubWithTime
-Java_org_simgrid_trace_Trace_linkSrcDstVariableAdd
-Java_org_simgrid_trace_Trace_linkSrcDstVariableSub
-Java_org_simgrid_trace_Trace_linkSrcDstVariableSetWithTime
-Java_org_simgrid_trace_Trace_linkSrcdstVariableAddWithTime
-Java_org_simgrid_trace_Trace_linkSrcDstVariableSubWithTime
-*/
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index 30d3f0f..9c8da06 100644 (file)
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -5,8 +5,7 @@
 
 #include <simgrid/Exception.hpp>
 #include <simgrid/kernel/routing/NetPoint.hpp>
-#include <simgrid/s4u/Host.hpp>
-#include <simgrid/s4u/VirtualMachine.hpp>
+#include <simgrid/s4u/Engine.hpp>
 #include <xbt/random.hpp>
 
 #include "src/instr/instr_private.hpp"
@@ -24,7 +23,7 @@ std::set<std::string, std::less<>> user_host_variables;
 std::set<std::string, std::less<>> user_vm_variables;
 std::set<std::string, std::less<>> user_link_variables;
 
-static void instr_user_variable(double time, const char* resource, const std::string& variable_name,
+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,
                                 const std::string& color, std::set<std::string, std::less<>>* filter)
 {
@@ -60,38 +59,25 @@ static void instr_user_variable(double time, const char* resource, const std::st
   }
 }
 
-static void instr_user_srcdst_variable(double time, const char* src, const char* dst, const std::string& variable,
-                                       const std::string& parent_type, double value, InstrUserVariable what)
+static void instr_user_srcdst_variable(double time, const std::string& src, const std::string& dst,
+                                       const std::string& variable, double value, InstrUserVariable what)
 {
-  const auto* src_elm = sg_netpoint_by_name_or_null(src);
-  xbt_assert(src_elm, "Element '%s' not found!", src);
+  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());
 
-  const auto* dst_elm = sg_netpoint_by_name_or_null(dst);
-  xbt_assert(dst_elm, "Element '%s' not found!", dst);
+  const auto* dst_elm = engine->netpoint_by_name_or_null(dst);
+  xbt_assert(dst_elm, "Element '%s' not found!", dst.c_str());
 
   std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
   simgrid::kernel::routing::NetZoneImpl::get_global_route(src_elm, dst_elm, route, nullptr);
   for (auto const& link : route)
-    instr_user_variable(time, link->get_cname(), variable, parent_type, value, what, "", &user_link_variables);
+    instr_user_variable(time, link->get_cname(), variable, "LINK", value, what, "", &user_link_variables);
 }
 
 namespace simgrid {
 namespace instr {
-static void user_srcdst_variable(double time, const s4u::Host* src, const s4u::Host* dst, const std::string& variable,
-                                 double value, InstrUserVariable what)
-{
-  const auto* src_elm = src->get_netpoint();
-  xbt_assert(src_elm, "Element '%s' not found!", src->get_cname());
-
-  const auto* dst_elm = dst->get_netpoint();
-  xbt_assert(dst_elm, "Element '%s' not found!", dst->get_cname());
-
-  std::vector<kernel::resource::StandardLinkImpl*> route;
-  kernel::routing::NetZoneImpl::get_global_route(src_elm, dst_elm, route, nullptr);
-  for (auto const& link : route)
-    instr_user_variable(time, link->get_cname(), variable, "LINK", value, what, "", &user_link_variables);
-}
-
+/* for host variables */
 /** @brief Declare a new user variable associated to hosts.
  *
  *  Declare a user variable that will be associated to hosts.
@@ -101,27 +87,24 @@ static void user_srcdst_variable(double time, const s4u::Host* src, const s4u::H
  */
 void declare_host_variable(const std::string& variable, const std::string& color)
 {
-  instr_user_variable(0, nullptr, variable, "HOST", 0, InstrUserVariable::DECLARE, color, &user_host_variables);
+  instr_user_variable(0, "", variable, "HOST", 0, InstrUserVariable::DECLARE, color, &user_host_variables);
 }
 
-void set_host_variable(const s4u::Host* host, const std::string& variable, double value, double time)
+void set_host_variable(const std::string& host, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, host->get_cname(), variable, "HOST", value, InstrUserVariable::SET, "",
-                      &user_host_variables);
+  instr_user_variable(time, host, variable, "HOST", value, InstrUserVariable::SET, "", &user_host_variables);
 }
 
 /** @brief Add a value to a variable of a host */
-void add_host_variable(const s4u::Host* host, const std::string& variable, double value, double time)
+void add_host_variable(const std::string& host, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, host->get_cname(), variable, "HOST", value, InstrUserVariable::ADD, "",
-                      &user_host_variables);
+  instr_user_variable(time, host, variable, "HOST", value, InstrUserVariable::ADD, "", &user_host_variables);
 }
 
 /** @brief Subtract a value to a variable of a host */
-void sub_host_variable(const s4u::Host* host, const std::string& variable, double value, double time)
+void sub_host_variable(const std::string& host, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, host->get_cname(), variable, "HOST", value, InstrUserVariable::SUB, "",
-                      &user_host_variables);
+  instr_user_variable(time, host, variable, "HOST", value, InstrUserVariable::SUB, "", &user_host_variables);
 }
 
 /** @brief Get host variables that were already declared with #declare_host_variable. */
@@ -130,6 +113,7 @@ const std::set<std::string, std::less<>>& get_host_variables()
   return user_host_variables;
 }
 
+/* for link variables */
 /** @brief Declare a new user variable associated to links.
  *
  *  Declare a user variable that will be associated to links.
@@ -139,47 +123,45 @@ const std::set<std::string, std::less<>>& get_host_variables()
  */
 void declare_link_variable(const std::string& variable, const std::string& color)
 {
-  instr_user_variable(0, nullptr, variable, "LINK", 0, InstrUserVariable::DECLARE, color, &user_link_variables);
+  instr_user_variable(0, "", variable, "LINK", 0, InstrUserVariable::DECLARE, color, &user_link_variables);
 }
 
-void set_link_variable(const s4u::Link* link, const std::string& variable, double value, double time)
+/** @brief Set the value of a variable of a link */
+void set_link_variable(const std::string& link, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, link->get_cname(), variable, "LINK", value, InstrUserVariable::SET, "",
-                      &user_link_variables);
+  instr_user_variable(time, link, variable, "LINK", value, InstrUserVariable::SET, "", &user_link_variables);
 }
 
-void set_link_variable(const s4u::Host* src, const s4u::Host* dst, const std::string& variable, double value,
+void set_link_variable(const std::string& src, const std::string& dst, const std::string& variable, double value,
                        double time)
 {
-  user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::SET);
+  instr_user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::SET);
 }
 
 /** @brief Add a value to a variable of a link */
-void add_link_variable(const s4u::Link* link, const std::string& variable, double value, double time)
+void add_link_variable(const std::string& link, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, link->get_cname(), variable, "LINK", value, InstrUserVariable::ADD, "",
-                      &user_link_variables);
+  instr_user_variable(time, link, variable, "LINK", value, InstrUserVariable::ADD, "", &user_link_variables);
 }
 
 /** @brief Add a value to a variable of a link */
-void add_link_variable(const s4u::Host* src, const s4u::Host* dst, const std::string& variable, double value,
+void add_link_variable(const std::string& src, const std::string& dst, const std::string& variable, double value,
                        double time)
 {
-  user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::ADD);
+  instr_user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::ADD);
 }
 
 /** @brief Subtract a value to a variable of a link */
-void sub_link_variable(const s4u::Link* link, const std::string& variable, double value, double time)
+void sub_link_variable(const std::string& link, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, link->get_cname(), variable, "LINK", value, InstrUserVariable::SUB, "",
-                      &user_link_variables);
+  instr_user_variable(time, link, variable, "LINK", value, InstrUserVariable::SUB, "", &user_link_variables);
 }
 
 /** @brief Subtract a value to a variable of a link */
-void sub_link_variable(const s4u::Host* src, const s4u::Host* dst, const std::string& variable, double value,
+void sub_link_variable(const std::string& src, const std::string& dst, const std::string& variable, double value,
                        double time)
 {
-  user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::SUB);
+  instr_user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::SUB);
 }
 
 /** @brief Get link variables that were already declared with #declare_link_variable. */
@@ -188,6 +170,7 @@ const std::set<std::string, std::less<>>& get_link_variables()
   return user_link_variables;
 }
 
+/* for VM variables */
 /** @brief Declare a new user variable associated to VMs.
  *
  *  Declare a user variable that will be associated to VMs. A user host variable can be used to trace user variables
@@ -196,24 +179,25 @@ const std::set<std::string, std::less<>>& get_link_variables()
  */
 void declare_vm_variable(const std::string& variable, const std::string& color)
 {
-  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 set_vm_variable(const s4u::VirtualMachine* vm, const std::string& variable, double value, double time)
+/** @brief Set the value of a variable of a vm */
+void set_vm_variable(const std::string& vm, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, vm->get_cname(), variable, "VM", value, InstrUserVariable::SET, "", &user_vm_variables);
+  instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SET, "", &user_vm_variables);
 }
 
 /** @brief Add a value to a variable of a VM */
-void add_vm_variable(const s4u::VirtualMachine* vm, const std::string& variable, double value, double time)
+void add_vm_variable(const std::string& vm, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, vm->get_cname(), variable, "HOST", value, InstrUserVariable::ADD, "", &user_vm_variables);
+  instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::ADD, "", &user_vm_variables);
 }
 
 /** @brief Subtract a value from a variable of a VM */
-void sub_vm_variable(const s4u::VirtualMachine* vm, const std::string& variable, double value, double time)
+void sub_vm_variable(const std::string& vm, const std::string& variable, double value, double time)
 {
-  instr_user_variable(time, vm->get_cname(), variable, "HOST", value, InstrUserVariable::SUB, "", &user_vm_variables);
+  instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SUB, "", &user_vm_variables);
 }
 
 /** @brief Get VM variables that were already declared with #declare_vm_variable. */
@@ -414,12 +398,6 @@ int TRACE_platform_graph_export_graphviz(const char* filename) // XBT_ATTRIB_DEP
   return 1;
 }
 
-/*
- * Derived functions that use instr_user_variable and TRACE_user_srcdst_variable. They were previously defined as
- * pre-processors directives, but were transformed into functions so the user can track them using gdb.
- */
-
-/* for VM variables */
 void TRACE_vm_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v333
 {
   instr_user_variable(0, nullptr, variable, "VM", 0, InstrUserVariable::DECLARE, "", &user_vm_variables);
@@ -429,16 +407,7 @@ void TRACE_vm_variable_declare_with_color(const char* variable, const char* colo
   instr_user_variable(0, nullptr, variable, "VM", 0, InstrUserVariable::DECLARE, color, &user_vm_variables);
 }
 
-/** @ingroup TRACE_user_variables
- *  @brief Set the value of a variable of a host.
- *
- *  @param vm The name of the VM to be considered.
- *  @param variable The name of the variable to be considered.
- *  @param value The new value of the variable.
- *
- *  @see TRACE_vm_variable_declare, TRACE_vm_variable_add, TRACE_vm_variable_sub
- */
-void TRACE_vm_variable_set (const char *vm, const char *variable, double value)
+void TRACE_vm_variable_set(const char* vm, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333
 {
   instr_user_variable(simgrid_get_clock(), vm, variable, "VM", value, InstrUserVariable::SET, "", &user_vm_variables);
 }
@@ -469,7 +438,6 @@ void TRACE_vm_variable_sub_with_time(double time, const char* vm, const char* va
   instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SUB, "", &user_vm_variables);
 }
 
-/* for host variables */
 void TRACE_host_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v333
 {
   simgrid::instr::declare_host_variable(variable);
@@ -480,37 +448,19 @@ void TRACE_host_variable_declare_with_color(const char* variable, const char* co
   simgrid::instr::declare_host_variable(variable, color);
 }
 
-/** @ingroup TRACE_user_variables
- *  @brief Set the value of a variable of a host.
- *
- *  @param host The name of the host to be considered.
- *  @param variable The name of the variable to be considered.
- *  @param value The new value of the variable.
- *
- *  @see TRACE_host_variable_declare, TRACE_host_variable_add, TRACE_host_variable_sub
- */
-void TRACE_host_variable_set (const char *host, const char *variable, double value)
+void TRACE_host_variable_set(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333
 {
   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)
+void TRACE_host_variable_add(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333
 {
   instr_user_variable(simgrid_get_clock(), host, variable, "HOST", value, InstrUserVariable::ADD, "",
                       &user_host_variables);
 }
 
-/** @ingroup TRACE_user_variables
- *  @brief Subtract a value from a variable of a host.
- *
- *  @param host The name of the host to be considered.
- *  @param variable The name of the variable to be considered.
- *  @param value The value to be subtracted from the variable.
- *
- *  @see TRACE_host_variable_declare, TRACE_host_variable_set, TRACE_host_variable_add
- */
-void TRACE_host_variable_sub(const char* host, const char* variable, double value)
+void TRACE_host_variable_sub(const char* host, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333
 {
   instr_user_variable(simgrid_get_clock(), host, variable, "HOST", value, InstrUserVariable::SUB, "",
                       &user_host_variables);
@@ -539,37 +489,17 @@ xbt_dynar_t TRACE_get_host_variables() // XBT_ATTRIB_DEPRECATED_v333
   return instr_set_to_dynar(user_host_variables);
 }
 
-/* for link variables */
 void TRACE_link_variable_declare(const char* variable) // XBT_ATTRIB_DEPRECATED_v333
 {
   simgrid::instr::declare_link_variable(variable);
 }
 
-/** @ingroup TRACE_user_variables
- *  @brief Declare a new user variable associated to links with a color.
- *
- *  Same as #TRACE_link_variable_declare, but associated a color to the newly created user link variable. The color
- *  needs to be a string with three numbers separated by spaces in the range [0,1].
- *  A light-gray color can be specified using "0.7 0.7 0.7" as color.
- *
- *  @param variable The name of the new variable to be declared.
- *  @param color The color for the new variable.
- */
 void TRACE_link_variable_declare_with_color(const char* variable, const char* color) // XBT_ATTRIB_DEPRECATED_v333
 {
   simgrid::instr::declare_link_variable(variable, color);
 }
 
-/** @ingroup TRACE_user_variables
- *  @brief Set the value of a variable of a link.
- *
- *  @param link The name of the link to be considered.
- *  @param variable The name of the variable to be considered.
- *  @param value The new value of the variable.
- *
- *  @see TRACE_link_variable_declare, TRACE_link_variable_add, TRACE_link_variable_sub
- */
-void TRACE_link_variable_set (const char *link, const char *variable, double value)
+void TRACE_link_variable_set(const char* link, const char* variable, double value) // XBT_ATTRIB_DEPRECATED_v333
 {
   instr_user_variable(simgrid_get_clock(), link, variable, "LINK", value, InstrUserVariable::SET, "",
                       &user_link_variables);
@@ -605,39 +535,40 @@ void TRACE_link_variable_sub_with_time(double time, const char* link, const char
   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)
+void TRACE_link_srcdst_variable_set(const char* src, const char* dst, const char* variable,
+                                    double value) // XBT_ATTRIB_DEPRECATED_v333
 {
-  instr_user_srcdst_variable(simgrid_get_clock(), src, dst, variable, "LINK", value, InstrUserVariable::SET);
+  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
 {
-  instr_user_srcdst_variable(simgrid_get_clock(), src, dst, variable, "LINK", value, InstrUserVariable::ADD);
+  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
 {
-  instr_user_srcdst_variable(simgrid_get_clock(), src, dst, variable, "LINK", value, InstrUserVariable::SUB);
+  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
 {
-  instr_user_srcdst_variable(time, src, dst, variable, "LINK", value, InstrUserVariable::SET);
+  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
 {
-  instr_user_srcdst_variable(time, src, dst, variable, "LINK", value, InstrUserVariable::ADD);
+  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
 {
-  instr_user_srcdst_variable(time, src, dst, variable, "LINK", value, InstrUserVariable::SUB);
+  instr_user_srcdst_variable(time, src, dst, variable, value, InstrUserVariable::SUB);
 }
 
 xbt_dynar_t TRACE_get_link_variables() // XBT_ATTRIB_DEPRECATED_v333