deprecate a large part of the old C tracing API

[simgrid.git] / src / bindings / java / jtrace.cpp

diff --git a/src/bindings/java/jtrace.cpp b/src/bindings/java/jtrace.cpp
index 02a351c..a2166cb 100644 (file)
--- a/src/bindings/java/jtrace.cpp
+++ b/src/bindings/java/jtrace.cpp
@@ -63,10 +63,10 @@ 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,
@@ -78,20 +78,28 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet (JNIEnv *env
   TRACE_host_variable_set(host, state, 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_state, jdouble value)
 {
   jstring_wrapper host(env, js_host);
   jstring_wrapper state(env, js_state);
 
-  TRACE_host_variable_sub(host, state, value);
+  TRACE_host_variable_add(host, state, 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_state, jdouble value)
 {
+  jstring_wrapper host(env, js_host);
   jstring_wrapper state(env, js_state);
 
-  TRACE_vm_variable_declare(state);
+  TRACE_host_variable_sub(host, state, value);
+}
+
+JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare(JNIEnv* env, jclass cls, jstring js_variable)
+{
+  jstring_wrapper variable(env, js_variable);
+  simgrid::instr::declare_vm_variable(variable);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *env, jclass cls, jstring js_vm,
@@ -103,23 +111,15 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *env,
   TRACE_vm_variable_set(vm, state, value);
 }
 
-JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd (JNIEnv *env, jclass cls, jstring js_host,
-                                                                     jstring js_state, jdouble value)
-{
-  jstring_wrapper host(env, js_host);
-  jstring_wrapper state(env, js_state);
-
-  TRACE_host_variable_set(host, state, 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);
@@ -132,26 +132,5 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSet
   jstring_wrapper src(env, jsrc);
   jstring_wrapper dst(env, jdst);
   jstring_wrapper variable(env, jvar);
-  TRACE_link_srcdst_variable_set(src,dst,variable, jval);
+  TRACE_link_srcdst_variable_set(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)
-*/