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

diff --git a/src/bindings/java/jtrace.cpp b/src/bindings/java/jtrace.cpp
index d097358f24..6a7c31100f 100644
--- a/src/bindings/java/jtrace.cpp
+++ b/src/bindings/java/jtrace.cpp
@@ -1,16 +1,13 @@
-/* Java Wrappers to the TRACE API.                                           */
+/* Java bindings of the Trace API.                                          */
 
-/* Copyright (c) 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2012-2021. 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. */
 
-// Please note, this file strongly relies on the jmsg.cpp,
-// It will be great that a JNI expert gives a look to validate it - Adrien ;)
-
 #include "jtrace.h"
-#include <simgrid/instr.h>
+#include "jxbt_utilities.hpp"
+#include "simgrid/instr.h"
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
@@ -21,177 +18,140 @@
 #endif
 /* end of eclipse-mandated pimple */
 
-// Define a new category
-XBT_LOG_NEW_DEFAULT_CATEGORY (jtrace, "TRACE for Java(TM)");
-
-SG_BEGIN_DECL()
-
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclare(JNIEnv * env, jclass cls, jstring js)
 {
-  const char *s = env->GetStringUTFChars(js, 0);
-  TRACE_host_state_declare(s);  
-  env->ReleaseStringUTFChars(js, s);
+  jstring_wrapper s(env, js);
+  TRACE_host_state_declare(s);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclareValue (JNIEnv *env, jclass cls, jstring js_state,
                                                                            jstring js_value, jstring js_color)
 {
-  const char *state = env->GetStringUTFChars(js_state, 0);
-  const char *value = env->GetStringUTFChars(js_value, 0);
-  const char *color = env->GetStringUTFChars(js_color, 0);
-
-  TRACE_host_state_declare_value(state, value, color);  
+  jstring_wrapper state(env, js_state);
+  jstring_wrapper value(env, js_value);
+  jstring_wrapper color(env, js_color);
 
-  env->ReleaseStringUTFChars(js_state, state);
-  env->ReleaseStringUTFChars(js_value, value);
-  env->ReleaseStringUTFChars(js_color, color);
+  TRACE_host_state_declare_value(state, value, color);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostSetState (JNIEnv *env, jclass cls, jstring js_host,
                                                                   jstring js_state, jstring js_value)
 {
-  const char *host = env->GetStringUTFChars(js_host, 0);
-  const char *state = env->GetStringUTFChars(js_state, 0);
-  const char *value = env->GetStringUTFChars(js_value, 0);
+  jstring_wrapper host(env, js_host);
+  jstring_wrapper state(env, js_state);
+  jstring_wrapper value(env, js_value);
 
-  TRACE_host_set_state(host, state, value);  
-
-  env->ReleaseStringUTFChars(js_host, host);
-  env->ReleaseStringUTFChars(js_state, state);
-  env->ReleaseStringUTFChars(js_value, value);
+  TRACE_host_set_state(host, state, value);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPushState (JNIEnv *env, jclass cls, jstring js_host,
                                                                    jstring js_state, jstring js_value)
 {
-  const char *host = env->GetStringUTFChars(js_host, 0);
-  const char *state = env->GetStringUTFChars(js_state, 0);
-  const char *value = env->GetStringUTFChars(js_value, 0);
-
-  TRACE_host_push_state(host, state, value);  
+  jstring_wrapper host(env, js_host);
+  jstring_wrapper state(env, js_state);
+  jstring_wrapper value(env, js_value);
 
-  env->ReleaseStringUTFChars(js_host, host);
-  env->ReleaseStringUTFChars(js_state, state);
-  env->ReleaseStringUTFChars(js_value, value);
+  TRACE_host_push_state(host, state, value);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPopState (JNIEnv *env, jclass cls, jstring js_host,
                                                                   jstring js_state)
 {
-  const char *host = env->GetStringUTFChars(js_host, 0);
-  const char *state = env->GetStringUTFChars(js_state, 0);
-
-  TRACE_host_pop_state(host, state);  
+  jstring_wrapper host(env, js_host);
+  jstring_wrapper state(env, js_state);
 
-  env->ReleaseStringUTFChars(js_host, host);
-  env->ReleaseStringUTFChars(js_state, state);
+  TRACE_host_pop_state(host, state);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare (JNIEnv *env, jclass cls, jstring js_state)
 {
-  const char *state = env->GetStringUTFChars(js_state, 0);
+  jstring_wrapper state(env, js_state);
   TRACE_host_variable_declare(state);
-  env->ReleaseStringUTFChars(js_state, state);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet (JNIEnv *env, jclass cls, jstring js_host,
                                                                      jstring js_state, jdouble value)
 {
-  const char *host = env->GetStringUTFChars(js_host, 0);
-  const char *state = env->GetStringUTFChars(js_state, 0);
+  jstring_wrapper host(env, js_host);
+  jstring_wrapper state(env, js_state);
 
   TRACE_host_variable_set(host, state, value);
-
-  env->ReleaseStringUTFChars(js_host, host);
-  env->ReleaseStringUTFChars(js_state, state);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub (JNIEnv *env, jclass cls, jstring js_host,
                                                                      jstring js_state, jdouble value)
 {
-  const char *host = env->GetStringUTFChars(js_host, 0);
-  const char *state = env->GetStringUTFChars(js_state, 0);
+  jstring_wrapper host(env, js_host);
+  jstring_wrapper state(env, js_state);
 
   TRACE_host_variable_sub(host, state, value);
-
-  env->ReleaseStringUTFChars(js_host, host);
-  env->ReleaseStringUTFChars(js_state, state);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare (JNIEnv *env, jclass cls, jstring js_state)
 {
-  const char *state = env->GetStringUTFChars(js_state, 0);
+  jstring_wrapper state(env, js_state);
 
   TRACE_vm_variable_declare(state);
-
-  env->ReleaseStringUTFChars(js_state, state);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *env, jclass cls, jstring js_vm,
                                                                    jstring js_state, jdouble value)
 {
-  const char *vm = env->GetStringUTFChars(js_vm, 0);
-  const char *state = env->GetStringUTFChars(js_state, 0);
+  jstring_wrapper vm(env, js_vm);
+  jstring_wrapper state(env, js_state);
 
   TRACE_vm_variable_set(vm, state, value);
-
-  env->ReleaseStringUTFChars(js_vm, vm);
-  env->ReleaseStringUTFChars(js_state, state);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd (JNIEnv *env, jclass cls, jstring js_host,
                                                                      jstring js_state, jdouble value)
 {
-  const char *host = env->GetStringUTFChars(js_host, 0);
-  const char *state = env->GetStringUTFChars(js_state, 0);
+  jstring_wrapper host(env, js_host);
+  jstring_wrapper state(env, js_state);
 
   TRACE_host_variable_set(host, state, value);
-
-  env->ReleaseStringUTFChars(js_host, host);
-  env->ReleaseStringUTFChars(js_state, state);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclare (JNIEnv *env, jclass cls, jstring jvar) {
-  const char *variable = env->GetStringUTFChars(jvar, 0);
+  jstring_wrapper variable(env, jvar);
   TRACE_link_variable_declare (variable);
-  env->ReleaseStringUTFChars(jvar, variable);
 }
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclareWithColor (JNIEnv *env, jclass cls, jstring jvar, jstring jcolor) {
-  const char *variable = env->GetStringUTFChars(jvar, 0);
-  const char *color = env->GetStringUTFChars(jcolor, 0);
+  jstring_wrapper variable(env, jvar);
+  jstring_wrapper color(env, jcolor);
   TRACE_link_variable_declare_with_color(variable,color);
-  env->ReleaseStringUTFChars(jvar, variable);
-  env->ReleaseStringUTFChars(jcolor, color);
 }
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSet (JNIEnv *env, jclass cls, jstring jlink, jstring jvar, jdouble jvalue) {
-  const char *link = env->GetStringUTFChars(jlink, 0);
-  const char *variable = env->GetStringUTFChars(jvar, 0);
+  jstring_wrapper link(env, jlink);
+  jstring_wrapper variable(env, jvar);
   TRACE_link_variable_set(link, variable, jvalue);
-  env->ReleaseStringUTFChars(jlink, link);
-  env->ReleaseStringUTFChars(jvar, variable);
 }
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSet
   (JNIEnv *env, jclass cls, jstring jsrc, jstring jdst, jstring jvar, jdouble jval)
 {
-  const char *src = env->GetStringUTFChars(jsrc, 0);
-  const char *dst = env->GetStringUTFChars(jdst, 0);
-  const char *variable = env->GetStringUTFChars(jvar, 0);
+  jstring_wrapper src(env, jsrc);
+  jstring_wrapper dst(env, jdst);
+  jstring_wrapper variable(env, jvar);
   TRACE_link_srcdst_variable_set(src,dst,variable, jval);
-  env->ReleaseStringUTFChars(jsrc, src);
-  env->ReleaseStringUTFChars(jdst, dst);
-  env->ReleaseStringUTFChars(jvar, variable);
 }
 /* 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);
+   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)
 */
-
-SG_END_DECL()