X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67d66b0cf79b9fc02c0450f254584693dbf21d3b..4c753f8d4cabd4104f3f7109823f16be2ebdcce3:/src/bindings/java/jtrace.cpp

diff --git a/src/bindings/java/jtrace.cpp b/src/bindings/java/jtrace.cpp
index 6a7c31100f..bcfa76854b 100644
--- a/src/bindings/java/jtrace.cpp
+++ b/src/bindings/java/jtrace.cpp
@@ -1,6 +1,6 @@
 /* Java bindings of the Trace API.                                          */
 
-/* Copyright (c) 2012-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2012-2022. 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. */
@@ -63,95 +63,77 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPopState (JNIEnv *env, j
   TRACE_host_pop_state(host, state);
 }
 
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare (JNIEnv *env, jclass cls, jstring js_state)
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare(JNIEnv* env, jclass cls, jstring js_variable)
 {
-  jstring_wrapper state(env, js_state);
-  TRACE_host_variable_declare(state);
+  jstring_wrapper variable(env, js_variable);
+  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_hostVariableSub (JNIEnv *env, jclass cls, jstring js_host,
-                                                                     jstring js_state, jdouble value)
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd(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_sub(host, state, value);
+  simgrid::instr::add_host_variable(host, variable, value);
 }
 
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare (JNIEnv *env, jclass cls, jstring js_state)
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub(JNIEnv* env, jclass cls, jstring js_host,
+                                                                    jstring js_variable, jdouble value)
 {
-  jstring_wrapper state(env, js_state);
+  jstring_wrapper host(env, js_host);
+  jstring_wrapper variable(env, js_variable);
 
-  TRACE_vm_variable_declare(state);
+  simgrid::instr::sub_host_variable(host, variable, value);
 }
 
-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_vmVariableDeclare(JNIEnv* env, jclass cls, jstring js_variable)
 {
-  jstring_wrapper vm(env, js_vm);
-  jstring_wrapper state(env, js_state);
-
-  TRACE_vm_variable_set(vm, state, value);
+  jstring_wrapper variable(env, js_variable);
+  simgrid::instr::declare_vm_variable(variable);
 }
 
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd (JNIEnv *env, jclass cls, jstring js_host,
-                                                                     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 host(env, js_host);
-  jstring_wrapper state(env, js_state);
+  jstring_wrapper vm(env, js_vm);
+  jstring_wrapper variable(env, js_variable);
 
-  TRACE_host_variable_set(host, 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) {
   jstring_wrapper variable(env, jvar);
-  TRACE_link_variable_declare (variable);
+  simgrid::instr::declare_link_variable(variable);
 }
+
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclareWithColor (JNIEnv *env, jclass cls, jstring jvar, jstring jcolor) {
   jstring_wrapper variable(env, jvar);
   jstring_wrapper color(env, jcolor);
-  TRACE_link_variable_declare_with_color(variable,color);
+  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);
 }
-/* Missing calls
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAdd(JNIEnv *, jclass, jstring, jstring, jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSub(JNIEnv *env, jclass cls, jstring, jstring,
-                                                                       jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSetWithTime(JNIEnv *, jclass, jdouble, jstring,
-                                                                               jstring, jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAddWithTime(JNIEnv *, jclass, jdouble, jstring,
-                                                                               jstring, jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSubWithTime(JNIEnv *, jclass, jdouble, jstring,
-                                                                               jstring, jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableAdd(JNIEnv *, jclass, jstring, jstring,
-                                                                             jstring, jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSub(JNIEnv *, jclass, jstring, jstring,
-                                                                             jstring, jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSetWithTime(JNIEnv *env, jclass cls, jdouble,
-                                                                                     jstring, jstring, jstring, jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcdstVariableAddWithTime(JNIEnv *env, jclass cls, jdouble,
-                                                                                     jstring, jstring, jstring, jdouble)
-   JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSubWithTime(JNIEnv *env, jclass cls, jdouble,
-                                                                                     jstring, jstring, jstring, jdouble)
-*/