X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/044232d4a90c59182da21f98f1dbd141814a68fa..15311a88748c43e1cce725bbfca20ea95e9debea:/src/bindings/java/jmsg.cpp

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 0a9bc6d11a..053f6ce802 100644
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -9,6 +9,7 @@
 #include <clocale>
 #include <string>
 
+#include "simgrid/Exception.hpp"
 #include "simgrid/msg.h"
 #include "simgrid/plugins/energy.h"
 #include "simgrid/plugins/file_system.h"
@@ -29,7 +30,6 @@
 
 #include "JavaContext.hpp"
 
-#include <xbt/ex.hpp>
 
 /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
 #ifndef JNIEXPORT
@@ -40,8 +40,6 @@
 #endif
 /* end of eclipse-mandated pimple */
 
-extern "C" {
-
 int JAVA_HOST_LEVEL = -1;
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
@@ -52,7 +50,7 @@ JNIEnv *get_current_thread_env()
 {
   using simgrid::kernel::context::JavaContext;
   JavaContext* ctx = static_cast<JavaContext*>(xbt_os_thread_get_extra_data());
-  return ctx->jenv;
+  return ctx->jenv_;
 }
 
 void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
@@ -239,7 +237,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_fileSystemInit()
 {
   sg_storage_file_system_init();
 }
-} // extern "C"
 
 /** Run a Java org.simgrid.msg.Process
  *
@@ -282,7 +279,7 @@ static int java_main(int argc, char *argv[])
   for (int i = 1; i < argc; i++)
       env->SetObjectArrayElement(args,i - 1, env->NewStringUTF(argv[i]));
   //Retrieve the host for the process.
-  jstring jhostName = env->NewStringUTF(MSG_host_self()->getCname());
+  jstring jhostName = env->NewStringUTF(MSG_host_self()->get_cname());
   jobject jhost = Java_org_simgrid_msg_Host_getByName(env, nullptr, jhostName);
   //creates the process
   jobject jprocess = env->NewObject(class_Process, constructor_Process, jhost, jname, args);
@@ -291,13 +288,13 @@ static int java_main(int argc, char *argv[])
   //bind the process to the context
   msg_process_t process = MSG_process_self();
 
-  context->jprocess = jprocess;
+  context->jprocess_ = jprocess;
   /* sets the PID and the PPID of the process */
   env->SetIntField(jprocess, jprocess_field_Process_pid, static_cast<jint>(MSG_process_get_PID(process)));
   env->SetIntField(jprocess, jprocess_field_Process_ppid, static_cast<jint>(MSG_process_get_PPID(process)));
   jprocess_bind(jprocess, process, env);
 
-  run_jprocess(env, context->jprocess);
+  run_jprocess(env, context->jprocess_);
   return 0;
 }
 
@@ -310,9 +307,9 @@ void java_main_jprocess(jobject jprocess)
 {
   JNIEnv *env = get_current_thread_env();
   simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
-  context->jprocess = jprocess;
-  jprocess_bind(context->jprocess, MSG_process_self(), env);
+  context->jprocess_                             = jprocess;
+  jprocess_bind(context->jprocess_, MSG_process_self(), env);
 
-  run_jprocess(env, context->jprocess);
+  run_jprocess(env, context->jprocess_);
 }
 }}}