X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/609ba683d48cc9eb7570548635e0b6218c57a747..d535c50c617ba838b99de4bd251a6ac076774d00:/src/bindings/java/JavaContext.cpp

diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp
index 7796bda171..5fe1c0cfab 100644
--- a/src/bindings/java/JavaContext.cpp
+++ b/src/bindings/java/JavaContext.cpp
@@ -29,6 +29,7 @@ ContextFactory* java_factory()
 
 JavaContextFactory::JavaContextFactory(): ContextFactory("JavaContextFactory")
 {
+  xbt_binary_name = xbt_strdup("java"); // Used by the backtrace displayer
 }
 
 JavaContextFactory::~JavaContextFactory()=default;
@@ -46,53 +47,24 @@ JavaContext* JavaContextFactory::create_context(std::function<void()> code, void
 
 void JavaContextFactory::run_all()
 {
-  for (smx_actor_t const& process : simgrid::simix::process_get_runnable()) {
-    static_cast<JavaContext*>(process->context_)->resume();
-  }
+  SerialThreadContext::run_all();
 }
 
-JavaContext::JavaContext(std::function<void()> code,
-        void_pfn_smxprocess_t cleanup_func,
-        smx_actor_t process)
-  : Context(std::move(code), cleanup_func, process)
+JavaContext::JavaContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
+    : SerialThreadContext(std::move(code), cleanup_func, process, false /* not maestro */)
 {
-  /* 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->thread_ = xbt_os_thread_create(nullptr, JavaContext::wrapper, this, nullptr);
-  } else {
-    xbt_os_thread_set_extra_data(this);
-  }
+  /* ThreadContext already does all we need */
 }
 
-JavaContext::~JavaContext()
+void JavaContext::start_hook()
 {
-  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_set_extra_data(this); // We need to attach it also for maestro, in contrary to our ancestor
 
-void* JavaContext::wrapper(void *data)
-{
-  JavaContext* context = static_cast<JavaContext*>(data);
-  xbt_os_thread_set_extra_data(context);
   //Attach the thread to the JVM
-
   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;
-  //Wait for the first scheduling round to happen.
-  xbt_os_sem_acquire(context->begin_);
-  //Create the "Process" object if needed.
-  (*context)();
-  context->stop();
-  return nullptr;
+  this->jenv_ = env;
 }
 
 void JavaContext::stop()
@@ -100,7 +72,7 @@ void JavaContext::stop()
   /* I was asked to die (either with kill() or because of a failed element) */
   if (this->iwannadie) {
     this->iwannadie = 0;
-    JNIEnv *env = get_current_thread_env();
+    JNIEnv* env     = this->jenv_;
     XBT_DEBUG("Gonna launch Killed Error");
     // When the process wants to stop before its regular end, we should cut its call stack quickly.
     // The easiest way to do so is to raise an exception that will be catched in its top calling level.
@@ -133,32 +105,16 @@ void JavaContext::stop()
     // In other words, we need to do in C++ what we do in Java for sake of uniformity.
     //
     // Plus, C++ RAII would work in that case, too.
-
     XBT_DEBUG("Trigger a cancel error at the C level");
     THROWF(cancel_error, 0, "process cancelled");
   } else {
-    Context::stop();
-    /* detach the thread and kills it */
+    ThreadContext::stop();
     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_thread_exit(nullptr);
   }
 }
 
-void JavaContext::suspend()
-{
-  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_);
-}
-
 }}} // namespace simgrid::kernel::context