#include <simgrid/msg.h>
#include <simgrid/simix.h>
+#include "simgrid/plugins/energy.h"
#include <locale.h>
#include <src/simix/smx_private.h>
JavaVM *__java_vm = nullptr;
-JavaVM *get_java_VM(void)
+JavaVM *get_java_VM()
{
return __java_vm;
}
-JNIEnv *get_current_thread_env(void)
+JNIEnv *get_current_thread_env()
{
JNIEnv *env;
env->GetJavaVM(&__java_vm);
- simgrid::simix::factory_initializer = simgrid::java::java_factory;
+ simgrid::simix::factory_initializer = &simgrid::java::java_factory;
jthrowable exc = env->ExceptionOccurred();
if (exc) {
env->ExceptionClear();
SG_END_DECL()
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit() {
+ sg_energy_plugin_init();
+}
+
/** Run a Java org.simgrid.msg.Process
*
* If needed, this waits for the process starting time.
static int java_main(int argc, char *argv[])
{
JNIEnv *env = get_current_thread_env();
- simgrid::java::JavaContext* context = (simgrid::java::JavaContext*) SIMIX_context_self();
+ simgrid::java::JavaContext* context = static_cast<simgrid::java::JavaContext*>(SIMIX_context_self());
//Change the "." in class name for "/".
xbt_str_subst(argv[0],'.','/',0);
//Retrieve the name of the process.
jstring jname = env->NewStringUTF(argv[0]);
//Build the arguments
- jobjectArray args = (jobjectArray)env->NewObjectArray(argc - 1,
- env->FindClass("java/lang/String"),
- env->NewStringUTF(""));
- int i;
- for (i = 1; i < argc; i++)
+ jobjectArray args = static_cast<jobjectArray>(env->NewObjectArray(argc - 1, env->FindClass("java/lang/String"),
+ env->NewStringUTF("")));
+ 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()));
context->jprocess = jprocess;
/* sets the PID and the PPID of the process */
- env->SetIntField(jprocess, jprocess_field_Process_pid,(jint) MSG_process_get_PID(process));
- env->SetIntField(jprocess, jprocess_field_Process_ppid, (jint) MSG_process_get_PPID(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);
void java_main_jprocess(jobject jprocess)
{
JNIEnv *env = get_current_thread_env();
- simgrid::java::JavaContext* context = (simgrid::java::JavaContext*) SIMIX_context_self();
+ simgrid::java::JavaContext* context = static_cast<simgrid::java::JavaContext*>(SIMIX_context_self());
context->jprocess = jprocess;
smx_process_t process = SIMIX_process_self();
jprocess_bind(context->jprocess, process, env);
}
}
-
-#include "simgrid/plugins/energy.h"
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Msg_energyInit(void) {
- sg_energy_plugin_init();
-}