/* 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 <locale.h>
+#include <algorithm>
+#include <clocale>
+#include <string>
-#include <simgrid/msg.h>
-#include <simgrid/simix.h>
-#include <simgrid/plugins/energy.h>
+#include "simgrid/Exception.hpp"
+#include "simgrid/msg.h"
+#include "simgrid/plugins/energy.h"
+#include "simgrid/plugins/file_system.h"
+#include "simgrid/plugins/live_migration.h"
+#include "simgrid/plugins/load.h"
+#include "simgrid/simix.h"
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/Host.hpp"
-#include <src/simix/smx_private.h>
+#include "src/simix/smx_private.hpp"
-#include "jmsg_process.h"
-#include "jmsg_as.h"
+#include "jmsg.hpp"
+#include "jmsg_as.hpp"
#include "jmsg_host.h"
+#include "jmsg_process.h"
#include "jmsg_storage.h"
#include "jmsg_task.h"
-#include "jxbt_utilities.h"
-#include "jmsg.h"
+#include "jxbt_utilities.hpp"
#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 */
-SG_BEGIN_DECL()
-
int JAVA_HOST_LEVEL = -1;
-int JAVA_STORAGE_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;
+ JavaContext* ctx = static_cast<JavaContext*>(simgrid::kernel::context::Context::self());
+ return ctx->jenv_;
}
void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
return (jdouble) MSG_get_clock();
}
-static void __JAVA_host_priv_free(void *host)
-{
-}
-
-static void __JAVA_storage_priv_free(void *storage)
-{
-}
-
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
{
- char **argv = nullptr;
- int index;
int argc = 0;
- jstring jval;
- const char *tmp;
-
- XBT_LOG_CONNECT(java);
- XBT_LOG_CONNECT(jtrace);
env->GetJavaVM(&__java_vm);
setlocale(LC_NUMERIC,"C");
if (jargs)
- argc = (int) env->GetArrayLength(jargs);
+ argc = static_cast<int>(env->GetArrayLength(jargs));
argc++;
- argv = xbt_new(char *, argc + 1);
+ char** argv = new char*[argc + 1];
argv[0] = xbt_strdup("java");
- for (index = 0; index < argc - 1; index++) {
- jval = (jstring) env->GetObjectArrayElement(jargs, index);
- tmp = env->GetStringUTFChars(jval, 0);
+ for (int index = 0; index < argc - 1; index++) {
+ jstring jval = (jstring)env->GetObjectArrayElement(jargs, index);
+ const char* tmp = env->GetStringUTFChars(jval, 0);
argv[index + 1] = xbt_strdup(tmp);
env->ReleaseStringUTFChars(jval, tmp);
}
argv[argc] = nullptr;
MSG_init(&argc, argv);
+ sg_vm_live_migration_plugin_init();
- JAVA_HOST_LEVEL = simgrid::s4u::Host::extension_create(__JAVA_host_priv_free);
- JAVA_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, __JAVA_storage_priv_free);
+ JAVA_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
- for (index = 0; index < argc; index++)
+ for (int index = 0; index < argc - 1; index++) {
+ env->SetObjectArrayElement(jargs, index, (jstring)env->NewStringUTF(argv[index + 1]));
free(argv[index]);
-
- free(argv);
+ }
+ free(argv[argc]);
+ delete[] argv;
}
JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
jxbt_check_res("MSG_main()", rv, MSG_OK,
xbt_strdup("unexpected error : MSG_main() failed .. please report this bug "));
- XBT_INFO("MSG_main finished; Cleaning up the simulation...");
+ XBT_INFO("MSG_main finished; Terminating the simulation...");
/* Cleanup java hosts */
xbt_dynar_t hosts = MSG_hosts_as_dynar();
for (unsigned long index = 0; index < xbt_dynar_length(hosts) - 1; index++) {
jobject jhost = (jobject) msg_host->extension(JAVA_HOST_LEVEL);
if (jhost)
jhost_unref(env, jhost);
-
}
xbt_dynar_free(&hosts);
/* Cleanup java storages */
- xbt_dynar_t storages = MSG_storages_as_dynar();
- if(!xbt_dynar_is_empty(storages)){
- for (unsigned long index = 0; index < xbt_dynar_length(storages) - 1; index++) {
- jobject jstorage = (jobject) xbt_lib_get_level(xbt_dynar_get_as(storages,index,msg_storage_t), JAVA_STORAGE_LEVEL);
- if (jstorage)
- jstorage_unref(env, jstorage);
- }
- }
- xbt_dynar_free(&storages);
+ for (auto const& elm : java_storage_map)
+ jstorage_unref(env, elm.second);
+
+ /* FIXME: don't be of such an EXTREM BRUTALITY to stop the jvm. Sorry I don't get it working otherwise.
+ * See the comment in ActorImpl.cpp::SIMIX_process_kill() */
+ exit(0);
}
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile)
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls)
{
- msg_netzone_t as = MSG_environment_get_routing_root();
+ msg_netzone_t as = MSG_zone_get_root();
jobject jas = jnetzone_new_instance(env);
- if (!jas) {
+ if (not jas) {
jxbt_throw_jni(env, "java As instantiation failed");
return nullptr;
}
jas = jnetzone_ref(env, jas);
- if (!jas) {
+ if (not jas) {
jxbt_throw_jni(env, "new global ref allocation failed");
return nullptr;
}
sg_host_energy_plugin_init();
}
-SG_END_DECL()
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_fileSystemInit()
+{
+ sg_storage_file_system_init();
+}
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_loadInit() {
+ sg_host_load_plugin_init();
+}
/** Run a Java org.simgrid.msg.Process
*
* If needed, this waits for the process starting time.
jdouble startTime = env->GetDoubleField(jprocess, jprocess_field_Process_startTime);
if (startTime > MSG_get_clock())
MSG_process_sleep(startTime - MSG_get_clock());
+
//Execution of the "run" method.
jmethodID id = jxbt_get_smethod(env, "org/simgrid/msg/Process", "run", "()V");
- xbt_assert((id != nullptr), "Method run() not found...");
+ xbt_assert((id != nullptr), "Method Process.run() not found...");
+
env->CallVoidMethod(jprocess, id);
}
static int java_main(int argc, char *argv[])
{
JNIEnv *env = get_current_thread_env();
- simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
+ simgrid::kernel::context::JavaContext* context =
+ static_cast<simgrid::kernel::context::JavaContext*>(simgrid::kernel::context::Context::self());
//Change the "." in class name for "/".
- xbt_str_subst(argv[0],'.','/',0);
- jclass class_Process = env->FindClass(argv[0]);
- xbt_str_subst(argv[0],'/','.',0);
+ std::string arg0 = argv[0];
+ std::replace(begin(arg0), end(arg0), '.', '/');
+ jclass class_Process = env->FindClass(arg0.c_str());
//Retrieve the methodID for the constructor
xbt_assert((class_Process != nullptr), "Class not found (%s). The deployment file must use the fully qualified class name, including the package. The case is important.", argv[0]);
jmethodID constructor_Process = env->GetMethodID(class_Process, "<init>", "(Lorg/simgrid/msg/Host;Ljava/lang/String;[Ljava/lang/String;)V");
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()->cname());
+ 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;
}
void java_main_jprocess(jobject jprocess)
{
JNIEnv *env = get_current_thread_env();
- simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
- context->jprocess = jprocess;
- smx_actor_t process = SIMIX_process_self();
- jprocess_bind(context->jprocess, process, env);
-
- // Adrien, ugly path, just to bypass creation of context at low levels (i.e such as for the VM migration for instance)
- if (context->jprocess != nullptr)
- run_jprocess(env, context->jprocess);
+ simgrid::kernel::context::JavaContext* context =
+ static_cast<simgrid::kernel::context::JavaContext*>(simgrid::kernel::context::Context::self());
+ context->jprocess_ = jprocess;
+ jprocess_bind(context->jprocess_, MSG_process_self(), env);
+
+ run_jprocess(env, context->jprocess_);
}
}}}
