/* 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 "simgrid/msg.h"
#include "simgrid/plugins/energy.h"
+#include "simgrid/plugins/file_system.h"
+#include "simgrid/plugins/live_migration.h"
#include "simgrid/simix.h"
#include "simgrid/s4u/Host.hpp"
#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;
return (jdouble) MSG_get_clock();
}
-static void __JAVA_host_priv_free(void *host)
-{
-}
-
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
{
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(__JAVA_host_priv_free);
+ JAVA_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
for (int index = 0; index < argc - 1; index++) {
env->SetObjectArrayElement(jargs, index, (jstring)env->NewStringUTF(argv[index + 1]));
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit() {
sg_host_energy_plugin_init();
}
-} // extern "C"
+
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_fileSystemInit()
+{
+ sg_storage_file_system_init();
+}
/** 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);