/* Context switching within the JVM. */
-/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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. */
JavaContextFactory::JavaContextFactory() : ContextFactory()
{
- xbt_binary_name = xbt_strdup("java"); // Used by the backtrace displayer
+ xbt_assert(xbt::binary_name == "java");
}
JavaContextFactory::~JavaContextFactory()=default;
-JavaContext* JavaContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_fun,
- smx_actor_t actor)
+Context* JavaContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor)
{
- return this->new_context<JavaContext>(std::move(code), cleanup_fun, actor);
+ return this->new_context<JavaContext>(std::move(code), actor);
}
void JavaContextFactory::run_all()
SerialThreadContext::run_all();
}
-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 */)
+JavaContext::JavaContext(std::function<void()>&& code, smx_actor_t actor)
+ : SerialThreadContext(std::move(code), actor, false /* not maestro */)
{
/* ThreadContext already does all we need */
}
//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");
+ xbt_assert(__java_vm->AttachCurrentThread((void**)&env, nullptr) == JNI_OK,
+ "The thread could not be attached to the JVM");
this->jenv_ = env;
}
-void JavaContext::stop()
+void JavaContext::stop_hook()
{
JNIEnv* env = this->jenv_;
env->DeleteGlobalRef(this->jprocess_);
- XBT_ATTRIB_UNUSED jint error = __java_vm->DetachCurrentThread();
+ jint error = __java_vm->DetachCurrentThread();
if (error != JNI_OK) {
/* This is probably a Java thread, ie an actor not created from the XML (and thus from the C++),
* but from Java with something like new Process().start().
* until run_jprocess(), IIUC.
*/
jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
- // XBT_ERROR("Cannot detach the current thread");
- // simgrid::xbt::Backtrace().display();
+ XBT_DEBUG("Cannot detach the current thread");
}
- ThreadContext::stop();
}
}}} // namespace simgrid::kernel::context