/* 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()
{
- for (smx_actor_t process : simgrid::simix::process_get_runnable()) {
- static_cast<JavaContext*>(process->context)->resume();
+ for (smx_actor_t const& process : simgrid::simix::process_get_runnable()) {
+ static_cast<JavaContext*>(process->context_)->resume();
}
}
/* 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);
std::throw_with_nested(std::move(new_exception));
}
} else {
- this->thread = nullptr;
xbt_os_thread_set_extra_data(this);
}
}
// (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