/* Context switching within the JVM. */
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. 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. */
#include "JavaContext.hpp"
-#include "jxbt_utilities.h"
-#include "src/simix/smx_private.h"
-#include "xbt/ex.hpp"
+#include "jxbt_utilities.hpp"
+#include "simgrid/Exception.hpp"
+#include "src/simix/smx_private.hpp"
#include <functional>
#include <utility>
-extern "C" JavaVM* __java_vm;
+extern JavaVM* __java_vm;
XBT_LOG_NEW_DEFAULT_CATEGORY(java, "MSG for Java(TM)");
return static_cast<JavaContext*>(xbt_os_thread_get_extra_data());
}
-JavaContext* JavaContextFactory::create_context(
- std::function<void()> code,
- void_pfn_smxprocess_t cleanup, smx_actor_t process)
+JavaContext* JavaContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_fun,
+ smx_actor_t actor)
{
- return this->new_context<JavaContext>(std::move(code), cleanup, process);
+ return this->new_context<JavaContext>(std::move(code), cleanup_fun, actor);
}
void JavaContextFactory::run_all()
{
- xbt_dynar_t processes = SIMIX_process_get_runnable();
- smx_actor_t process;
- unsigned int cursor;
- xbt_dynar_foreach(processes, cursor, process) {
- static_cast<JavaContext*>(process->context)->resume();
+ for (smx_actor_t const& process : simgrid::simix::process_get_runnable()) {
+ static_cast<JavaContext*>(process->context_)->resume();
}
}
smx_actor_t process)
: Context(std::move(code), cleanup_func, process)
{
- static int thread_amount=0;
- thread_amount++;
-
- /* If the user provided a function for the process then use it otherwise is the context for maestro */
+ /* If the user provided a function for the process then use it. Otherwise is the context for maestro */
if (has_code()) {
- this->jprocess = nullptr;
- this->begin = xbt_os_sem_init(0);
- this->end = xbt_os_sem_init(0);
-
- try {
- this->thread = xbt_os_thread_create(
- nullptr, JavaContext::wrapper, this, nullptr);
- }
- catch (xbt_ex& ex) {
- char* str = bprintf(
- "Failed to create context #%d. You may want to switch to Java coroutines to increase your limits (error: %s)."
- "See the Install section of simgrid-java documentation (in doc/install.html) for more on coroutines.",
- thread_amount, ex.what());
- xbt_ex new_exception(XBT_THROW_POINT, str);
- new_exception.category = ex.category;
- new_exception.value = ex.value;
- std::throw_with_nested(std::move(new_exception));
- }
+ 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 {
- this->thread = nullptr;
xbt_os_thread_set_extra_data(this);
}
}
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_);
}
}
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();
// (as the ones created for the VM migration). The Java exception will not be catched anywhere.
// Bad things happen currently if these actors get killed, unfortunately.
jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError",
- std::string("Process ") + this->process()->cname() + " killed from file JavaContext.cpp");
+ std::string("Process ") + this->process()->get_cname() + " killed from file JavaContext.cpp");
// (remember that throwing a java exception from C does not break the C execution path.
// Instead, it marks the exception to be raised when returning to the Java world and
} 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
