/* Java Wrappers to the MSG API. */
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. 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 <simgrid/msg.h>
#include <simgrid/simix.h>
-#include "simgrid/plugins/energy.h"
-#include <locale.h>
+#include <simgrid/plugins/energy.h>
+
+#include <simgrid/s4u/host.hpp>
+
#include <src/simix/smx_private.h>
#include "jmsg_process.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
#define JNIEXPORT
int JAVA_HOST_LEVEL = -1;
int JAVA_STORAGE_LEVEL = -1;
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
JavaVM *__java_vm = nullptr;
JNIEnv *get_current_thread_env()
{
- JNIEnv *env;
-
- __java_vm->AttachCurrentThread((void **) &env, nullptr);
- return env;
+ using simgrid::kernel::context::JavaContext;
+ JavaContext* ctx = static_cast<JavaContext*>(xbt_os_thread_get_extra_data());
+ return ctx->jenv;
}
void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
switch (status) {
case MSG_TIMEOUT:
- jxbt_throw_time_out_failure(env,nullptr);
- break;
+ jxbt_throw_time_out_failure(env, "");
+ break;
case MSG_TRANSFER_FAILURE:
- jxbt_throw_transfer_failure(env,nullptr);
- break;
+ jxbt_throw_transfer_failure(env, "");
+ break;
case MSG_HOST_FAILURE:
- jxbt_throw_host_failure(env,nullptr);
- break;
+ jxbt_throw_host_failure(env, "");
+ break;
case MSG_TASK_CANCELED:
- jxbt_throw_task_cancelled(env,nullptr);
- break;
+ jxbt_throw_task_cancelled(env, "");
+ break;
default:
- jxbt_throw_native(env,xbt_strdup("undefined message failed "
- "(please see jmsg_throw_status function in jmsg.cpp)"));
+ xbt_die("undefined message failed (please see jmsg_throw_status function in jmsg.cpp)");
}
}
jstring jval;
const char *tmp;
- XBT_LOG_CONNECT(jmsg);
+ XBT_LOG_CONNECT(java);
XBT_LOG_CONNECT(jtrace);
env->GetJavaVM(&__java_vm);
- simgrid::simix::factory_initializer = simgrid::java::java_factory;
+ simgrid::kernel::context::factory_initializer = &simgrid::kernel::context::java_factory;
jthrowable exc = env->ExceptionOccurred();
if (exc) {
env->ExceptionClear();
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls)
{
- msg_as_t as = MSG_environment_get_routing_root();
- jobject jas = jas_new_instance(env);
+ msg_netzone_t as = MSG_environment_get_routing_root();
+ jobject jas = jnetzone_new_instance(env);
if (!jas) {
jxbt_throw_jni(env, "java As instantiation failed");
return nullptr;
}
- jas = jas_ref(env, jas);
+ jas = jnetzone_ref(env, jas);
if (!jas) {
jxbt_throw_jni(env, "new global ref allocation failed");
return nullptr;
}
- jas_bind(jas, as, env);
+ jnetzone_bind(jas, as, env);
return (jobject) jas;
}
MSG_launch_application(deploymentFile);
}
-SG_END_DECL()
-
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit() {
- sg_energy_plugin_init();
+ sg_host_energy_plugin_init();
}
+SG_END_DECL()
+
/** Run a Java org.simgrid.msg.Process
*
* If needed, this waits for the process starting time.
*/
static void run_jprocess(JNIEnv *env, jobject jprocess)
{
- xbt_assert(jprocess != nullptr, "Process not created...");
- //wait for the process to be able to begin
- //TODO: Cache it
+ // wait for the process's start time
jfieldID jprocess_field_Process_startTime = jxbt_get_sfield(env, "org/simgrid/msg/Process", "startTime", "D");
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 not found...");
+ xbt_assert((id != nullptr), "Method run() not found...");
env->CallVoidMethod(jprocess, id);
}
static int java_main(int argc, char *argv[])
{
JNIEnv *env = get_current_thread_env();
- simgrid::java::JavaContext* context = static_cast<simgrid::java::JavaContext*>(SIMIX_context_self());
+ simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
//Change the "." in class name for "/".
xbt_str_subst(argv[0],'.','/',0);
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_get_name(MSG_host_self()));
+ jstring jhostName = env->NewStringUTF(MSG_host_self()->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);
}
namespace simgrid {
-namespace java {
+namespace kernel {
+namespace context {
/** Run the Java org.simgrid.msg.Process */
void java_main_jprocess(jobject jprocess)
{
JNIEnv *env = get_current_thread_env();
- simgrid::java::JavaContext* context = static_cast<simgrid::java::JavaContext*>(SIMIX_context_self());
+ simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
context->jprocess = jprocess;
- smx_process_t process = SIMIX_process_self();
+ 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)
- return;
- else
+ if (context->jprocess != nullptr)
run_jprocess(env, context->jprocess);
}
-
-}
-}
+}}}