[java] Switch Java bindings to .cpp

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

diff --git a/src/bindings/java/jtrace.c b/src/bindings/java/jtrace.cpp
similarity index 51%
rename from src/bindings/java/jtrace.c
rename to src/bindings/java/jtrace.cpp
index 3f923e6..342d258 100644 (file)
--- a/src/bindings/java/jtrace.c
+++ b/src/bindings/java/jtrace.cpp
@@ -6,7 +6,7 @@
 /* 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.c, 
+// 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"
@@ -27,101 +27,101 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (jtrace, bindings, "TRACE for Java(TM)");
 JNIEXPORT void JNICALL
 Java_org_simgrid_trace_Trace_hostStateDeclare(JNIEnv * env, jclass cls, jstring js)
 {
-  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  const char *s = env->GetStringUTFChars(js, 0);
   TRACE_host_state_declare(s);  
-  (*env)->ReleaseStringUTFChars(env, js, s);
+  env->ReleaseStringUTFChars(js, 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(env, js_state, 0);
-  const char *value = (*env)->GetStringUTFChars(env, js_value, 0);
-  const char *color = (*env)->GetStringUTFChars(env, js_color, 0);
+  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);  
   
-  (*env)->ReleaseStringUTFChars(env, js_state, state);
-  (*env)->ReleaseStringUTFChars(env, js_value, value);
-  (*env)->ReleaseStringUTFChars(env, js_color, color);
+  env->ReleaseStringUTFChars(js_state, state);
+  env->ReleaseStringUTFChars(js_value, value);
+  env->ReleaseStringUTFChars(js_color, 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(env, js_host, 0);
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
-  const char *value = (*env)->GetStringUTFChars(env, js_value, 0);
+  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_set_state(host, state, value);  
   
-  (*env)->ReleaseStringUTFChars(env, js_host, host);
-  (*env)->ReleaseStringUTFChars(env, js_state, state);
-  (*env)->ReleaseStringUTFChars(env, js_value, value);
+  env->ReleaseStringUTFChars(js_host, host);
+  env->ReleaseStringUTFChars(js_state, state);
+  env->ReleaseStringUTFChars(js_value, 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(env, js_host, 0);
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
-  const char *value = (*env)->GetStringUTFChars(env, js_value, 0);
+  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);  
   
-  (*env)->ReleaseStringUTFChars(env, js_host, host);
-  (*env)->ReleaseStringUTFChars(env, js_state, state);
-  (*env)->ReleaseStringUTFChars(env, js_value, value);
+  env->ReleaseStringUTFChars(js_host, host);
+  env->ReleaseStringUTFChars(js_state, state);
+  env->ReleaseStringUTFChars(js_value, 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(env, js_host, 0);
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
+  const char *host = env->GetStringUTFChars(js_host, 0);
+  const char *state = env->GetStringUTFChars(js_state, 0);
 
   TRACE_host_pop_state(host, state);  
   
-  (*env)->ReleaseStringUTFChars(env, js_host, host);
-  (*env)->ReleaseStringUTFChars(env, js_state, state);
+  env->ReleaseStringUTFChars(js_host, host);
+  env->ReleaseStringUTFChars(js_state, state);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare
   (JNIEnv *env, jclass cls, jstring js_state)
 {
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
+  const char *state = env->GetStringUTFChars(js_state, 0);
 
   TRACE_host_variable_declare(state);
 
-  (*env)->ReleaseStringUTFChars(env, js_state, 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(env, js_host, 0);
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
+  const char *host = env->GetStringUTFChars(js_host, 0);
+  const char *state = env->GetStringUTFChars(js_state, 0);
 
   TRACE_host_variable_set(host, state, value);
 
-  (*env)->ReleaseStringUTFChars(env, js_host, host);
-  (*env)->ReleaseStringUTFChars(env, js_state, state);
+  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(env, js_host, 0);
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
+  const char *host = env->GetStringUTFChars(js_host, 0);
+  const char *state = env->GetStringUTFChars(js_state, 0);
 
   TRACE_host_variable_sub(host, state, value);
 
-  (*env)->ReleaseStringUTFChars(env, js_host, host);
-  (*env)->ReleaseStringUTFChars(env, js_state, state);
+  env->ReleaseStringUTFChars(js_host, host);
+  env->ReleaseStringUTFChars(js_state, state);
 }
 
 
@@ -129,33 +129,33 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub
 JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare
   (JNIEnv *env, jclass cls, jstring js_state)
 {
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
+  const char *state = env->GetStringUTFChars(js_state, 0);
 
   TRACE_vm_variable_declare(state);
 
-  (*env)->ReleaseStringUTFChars(env, js_state, 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(env, js_vm, 0);
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
+  const char *vm = env->GetStringUTFChars(js_vm, 0);
+  const char *state = env->GetStringUTFChars(js_state, 0);
 
   TRACE_vm_variable_set(vm, state, value);
 
-  (*env)->ReleaseStringUTFChars(env, js_vm, vm);
-  (*env)->ReleaseStringUTFChars(env, js_state, state);
+  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(env, js_host, 0);
-  const char *state = (*env)->GetStringUTFChars(env, js_state, 0);
+  const char *host = env->GetStringUTFChars(js_host, 0);
+  const char *state = env->GetStringUTFChars(js_state, 0);
 
   TRACE_host_variable_set(host, state, value);
 
-  (*env)->ReleaseStringUTFChars(env, js_host, host);
-  (*env)->ReleaseStringUTFChars(env, js_state, state);
+  env->ReleaseStringUTFChars(js_host, host);
+  env->ReleaseStringUTFChars(js_state, state);
 }