XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg, "MSG for Java(TM)");
namespace simgrid {
-namespace java {
+namespace kernel {
+namespace context {
-simgrid::simix::ContextFactory* java_factory()
+ContextFactory* java_factory()
{
XBT_INFO("Using regular java threads.");
return new JavaContextFactory();
JavaContext* JavaContextFactory::create_context(
std::function<void()> code,
- void_pfn_smxprocess_t cleanup, smx_process_t process)
+ void_pfn_smxprocess_t cleanup, smx_actor_t process)
{
return this->new_context<JavaContext>(std::move(code), cleanup, process);
}
void JavaContextFactory::run_all()
{
xbt_dynar_t processes = SIMIX_process_get_runnable();
- smx_process_t process;
+ smx_actor_t process;
unsigned int cursor;
xbt_dynar_foreach(processes, cursor, process) {
static_cast<JavaContext*>(SIMIX_process_get_context(process))->resume();
JavaContext::JavaContext(std::function<void()> code,
void_pfn_smxprocess_t cleanup_func,
- smx_process_t process)
+ smx_actor_t process)
: Context(std::move(code), cleanup_func, process)
{
static int thread_amount=0;
// jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process %s killed :) (file smx_context_java.c)", MSG_process_get_name( (msg_process_t)context) ));
jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError",
bprintf("Process %s killed :) (file JavaContext.cpp)",
- simcall_process_get_name(this->process()) ));
+ this->process()->name.c_str() ));
XBT_DEBUG("Trigger a cancel error at the C level");
THROWF(cancel_error, 0, "process cancelled");
} else {
xbt_os_sem_acquire(this->end);
}
-}
-}
+}}} // namespace simgrid::kernel::context