java: obey our coding standard

diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp
index 82de71b..7796bda 100644 (file)
--- a/src/bindings/java/JavaContext.cpp
+++ b/src/bindings/java/JavaContext.cpp
@@ -58,10 +58,10 @@ JavaContext::JavaContext(std::function<void()> code,
 {
   /* If the user provided a function for the process then use it. Otherwise is the context for maestro */
   if (has_code()) {
-    this->begin = xbt_os_sem_init(0);
-    this->end = xbt_os_sem_init(0);
+    this->begin_ = xbt_os_sem_init(0);
+    this->end_   = xbt_os_sem_init(0);
 
-    this->thread = xbt_os_thread_create(nullptr, JavaContext::wrapper, this, nullptr);
+    this->thread_ = xbt_os_thread_create(nullptr, JavaContext::wrapper, this, nullptr);
   } else {
     xbt_os_thread_set_extra_data(this);
   }
@@ -69,11 +69,11 @@ JavaContext::JavaContext(std::function<void()> code,
 
 JavaContext::~JavaContext()
 {
-  if (this->thread) {
+  if (this->thread_) {
     // We are not in maestro context
-    xbt_os_thread_join(this->thread, nullptr);
-    xbt_os_sem_destroy(this->begin);
-    xbt_os_sem_destroy(this->end);
+    xbt_os_thread_join(this->thread_, nullptr);
+    xbt_os_sem_destroy(this->begin_);
+    xbt_os_sem_destroy(this->end_);
   }
 }
 
@@ -86,9 +86,9 @@ void* JavaContext::wrapper(void *data)
   JNIEnv *env;
   XBT_ATTRIB_UNUSED jint error = __java_vm->AttachCurrentThread((void**)&env, nullptr);
   xbt_assert((error == JNI_OK), "The thread could not be attached to the JVM");
-  context->jenv = env;
+  context->jenv_ = env;
   //Wait for the first scheduling round to happen.
-  xbt_os_sem_acquire(context->begin);
+  xbt_os_sem_acquire(context->begin_);
   //Create the "Process" object if needed.
   (*context)();
   context->stop();
@@ -139,26 +139,26 @@ void JavaContext::stop()
   } else {
     Context::stop();
     /* detach the thread and kills it */
-    JNIEnv *env = this->jenv;
-    env->DeleteGlobalRef(this->jprocess);
+    JNIEnv* env = this->jenv_;
+    env->DeleteGlobalRef(this->jprocess_);
     XBT_ATTRIB_UNUSED jint error = __java_vm->DetachCurrentThread();
     xbt_assert((error == JNI_OK), "The thread couldn't be detached.");
-    xbt_os_sem_release(this->end);
+    xbt_os_sem_release(this->end_);
     xbt_os_thread_exit(nullptr);
   }
 }
 
 void JavaContext::suspend()
 {
-  xbt_os_sem_release(this->end);
-  xbt_os_sem_acquire(this->begin);
+  xbt_os_sem_release(this->end_);
+  xbt_os_sem_acquire(this->begin_);
 }
 
 // FIXME: inline those functions
 void JavaContext::resume()
 {
-  xbt_os_sem_release(this->begin);
-  xbt_os_sem_acquire(this->end);
+  xbt_os_sem_release(this->begin_);
+  xbt_os_sem_acquire(this->end_);
 }
 
 }}} // namespace simgrid::kernel::context

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 462f9a2..2724033 100644 (file)
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -27,14 +27,14 @@ class JavacontextFactory;
 class JavaContext : public simgrid::kernel::context::Context {
 public:
   // The java process instance bound with the msg process structure:
-  jobject jprocess = nullptr;
+  jobject jprocess_ = nullptr;
   // JNI interface pointer associated to this thread:
-  JNIEnv *jenv = nullptr;
-  xbt_os_thread_t thread = nullptr;
-  // Sempahore used to schedule/yield the process:
-  xbt_os_sem_t begin = nullptr;
+  JNIEnv* jenv_           = nullptr;
+  xbt_os_thread_t thread_ = nullptr;
+  // Sempahore used to schedule/yield to the process:
+  xbt_os_sem_t begin_ = nullptr;
   // Semaphore used to schedule/unschedule the process:
-  xbt_os_sem_t end = nullptr;
+  xbt_os_sem_t end_ = nullptr;
 
   friend class JavaContextFactory;
   JavaContext(std::function<void()> code,

diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index bb621d8..053f6ce 100644 (file)
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -50,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) {
@@ -288,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;
 }
 
@@ -307,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_);
 }
 }}}

diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index f914fc8..758b381 100644 (file)
--- a/src/bindings/java/jmsg_process.cpp
+++ b/src/bindings/java/jmsg_process.cpp
@@ -26,7 +26,7 @@ jobject jprocess_from_native(msg_process_t process)
 {
   simgrid::kernel::context::JavaContext* context =
       (simgrid::kernel::context::JavaContext*)process->get_impl()->context_;
-  return context->jprocess;
+  return context->jprocess_;
 }
 
 jobject jprocess_ref(jobject jprocess, JNIEnv* env)