/* Java Wrappers to the MSG API. */
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-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 <clocale>
#include <string>
+#include "simgrid/Exception.hpp"
#include "simgrid/msg.h"
#include "simgrid/plugins/energy.h"
#include "simgrid/plugins/file_system.h"
#include "JavaContext.hpp"
-#include <xbt/ex.hpp>
/* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
#ifndef JNIEXPORT
#endif
/* end of eclipse-mandated pimple */
-extern "C" {
-
int JAVA_HOST_LEVEL = -1;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
JavaVM *__java_vm = nullptr;
-JavaVM *get_java_VM()
-{
- return __java_vm;
-}
-
JNIEnv *get_current_thread_env()
{
using simgrid::kernel::context::JavaContext;
JavaContext* ctx = static_cast<JavaContext*>(xbt_os_thread_get_extra_data());
- return ctx->jenv;
+ return ctx->jenv_;
}
void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
{
int argc = 0;
- XBT_LOG_CONNECT(java);
- XBT_LOG_CONNECT(jtrace);
-
env->GetJavaVM(&__java_vm);
simgrid::kernel::context::factory_initializer = &simgrid::kernel::context::java_factory;
argv[argc] = nullptr;
MSG_init(&argc, argv);
+ sg_vm_live_migration_plugin_init();
JAVA_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
sg_host_energy_plugin_init();
}
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_liveMigrationInit()
-{
- sg_vm_live_migration_plugin_init();
-}
-
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_fileSystemInit()
{
sg_storage_file_system_init();
}
-} // extern "C"
/** Run a Java org.simgrid.msg.Process
*
for (int i = 1; i < argc; i++)
env->SetObjectArrayElement(args,i - 1, env->NewStringUTF(argv[i]));
//Retrieve the host for the process.
- jstring jhostName = env->NewStringUTF(MSG_host_self()->getCname());
+ jstring jhostName = env->NewStringUTF(MSG_host_self()->get_cname());
jobject jhost = Java_org_simgrid_msg_Host_getByName(env, nullptr, jhostName);
//creates the process
jobject jprocess = env->NewObject(class_Process, constructor_Process, jhost, jname, args);
//bind the process to the context
msg_process_t process = MSG_process_self();
- context->jprocess = jprocess;
+ context->jprocess_ = jprocess;
/* sets the PID and the PPID of the process */
env->SetIntField(jprocess, jprocess_field_Process_pid, static_cast<jint>(MSG_process_get_PID(process)));
env->SetIntField(jprocess, jprocess_field_Process_ppid, static_cast<jint>(MSG_process_get_PPID(process)));
jprocess_bind(jprocess, process, env);
- run_jprocess(env, context->jprocess);
+ run_jprocess(env, context->jprocess_);
return 0;
}
{
JNIEnv *env = get_current_thread_env();
simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
- context->jprocess = jprocess;
- jprocess_bind(context->jprocess, MSG_process_self(), env);
+ context->jprocess_ = jprocess;
+ jprocess_bind(context->jprocess_, MSG_process_self(), env);
- run_jprocess(env, context->jprocess);
+ run_jprocess(env, context->jprocess_);
}
}}}