#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
jxbt_throw_task_cancelled(env,nullptr);
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)");
}
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls)
{
- msg_as_t as = MSG_environment_get_routing_root();
+ msg_netzone_t as = MSG_environment_get_routing_root();
jobject jas = jas_new_instance(env);
if (!jas) {
jxbt_throw_jni(env, "java As instantiation failed");
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);
}
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);
}
}}}