X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc9db1be8c886672e63a1589a5a2b8e9a9561818..67d66b0cf79b9fc02c0450f254584693dbf21d3b:/src/bindings/java/jmsg.cpp diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index 80618e0c8c..bdc6661fb7 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -1,6 +1,4 @@ -/* Java Wrappers to the MSG API. */ - -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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. */ @@ -12,28 +10,23 @@ #include #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/Actor.hpp" #include "simgrid/s4u/Host.hpp" -#include "src/simix/smx_private.hpp" - #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.hpp" #include "JavaContext.hpp" - /* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */ #ifndef JNIEXPORT #define JNIEXPORT @@ -110,10 +103,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv* env, jclass, jobjec args.emplace_back("java"); for (int index = 1; index < argc; index++) { - jstring jval = (jstring)env->GetObjectArrayElement(jargs, index - 1); - const char* tmp = env->GetStringUTFChars(jval, 0); - args.emplace_back(tmp); - env->ReleaseStringUTFChars(jval, tmp); + auto jval = (jstring)env->GetObjectArrayElement(jargs, index - 1); + jstring_wrapper tmp(env, jval); + args.emplace_back(tmp.value); } std::unique_ptr argv(new char*[argc + 1]); @@ -134,27 +126,20 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv* env, jclass, jobjec JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv* env, jclass) { /* Run everything */ - XBT_DEBUG("Ready to run MSG_MAIN"); - msg_error_t rv = MSG_main(); - XBT_DEBUG("Done running MSG_MAIN"); - jxbt_check_res("MSG_main()", rv, MSG_OK, - xbt_strdup("unexpected error : MSG_main() failed .. please report this bug ")); - - XBT_INFO("MSG_main finished; Terminating the simulation..."); + XBT_DEBUG("Ready to run"); + simgrid_run(); + XBT_DEBUG("Done running"); + XBT_INFO("Terminating the simulation..."); /* Cleanup java hosts */ sg_host_t* hosts = sg_host_list(); size_t host_count = sg_host_count(); for (size_t index = 0; index < host_count - 1; index++) { - jobject jhost = (jobject)hosts[index]->extension(JAVA_HOST_LEVEL); + auto jhost = (jobject)hosts[index]->extension(JAVA_HOST_LEVEL); if (jhost) jhost_unref(env, jhost); } xbt_free(hosts); - /* Cleanup java storages */ - for (auto const& elm : java_storage_map) - jstorage_unref(env, elm.second); - /* Display the status of remaining threads. None should survive, but who knows */ jclass clsProcess = jxbt_get_class(env, "org/simgrid/msg/Process"); jmethodID idDebug = jxbt_get_static_jmethod(env, clsProcess, "debugAllThreads", "()V"); @@ -164,16 +149,13 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv* env, jclass) JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv* env, jclass, jstring jplatformFile) { - const char *platformFile = env->GetStringUTFChars(jplatformFile, 0); - - MSG_create_environment(platformFile); - - env->ReleaseStringUTFChars(jplatformFile, platformFile); + jstring_wrapper platformFile(env, jplatformFile); + simgrid_load_platform(platformFile); } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv* env, jclass) { - msg_netzone_t as = sg_zone_get_root(); + sg_netzone_t as = sg_zone_get_root(); jobject jas = jnetzone_new_instance(env); if (not jas) { jxbt_throw_jni(env, "java As instantiation failed"); @@ -191,51 +173,45 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNI JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv* env, jclass, jstring js) { - const char *s = env->GetStringUTFChars(js, 0); - XBT_DEBUG("%s", s); - env->ReleaseStringUTFChars(js, s); + jstring_wrapper s(env, js); + XBT_DEBUG("%s", s.value); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv* env, jclass, jstring js) { - const char *s = env->GetStringUTFChars(js, 0); - XBT_VERB("%s", s); - env->ReleaseStringUTFChars(js, s); + jstring_wrapper s(env, js); + XBT_VERB("%s", s.value); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv* env, jclass, jstring js) { - const char *s = env->GetStringUTFChars(js, 0); - XBT_INFO("%s", s); - env->ReleaseStringUTFChars(js, s); + jstring_wrapper s(env, js); + XBT_INFO("%s", s.value); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv* env, jclass, jstring js) { - const char *s = env->GetStringUTFChars(js, 0); - XBT_WARN("%s", s); - env->ReleaseStringUTFChars(js, s); + jstring_wrapper s(env, js); + XBT_WARN("%s", s.value); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv* env, jclass, jstring js) { - const char *s = env->GetStringUTFChars(js, 0); - XBT_ERROR("%s", s); - env->ReleaseStringUTFChars(js, s); + jstring_wrapper s(env, js); + XBT_ERROR("%s", s.value); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv* env, jclass, jstring js) { - const char *s = env->GetStringUTFChars(js, 0); - XBT_CRITICAL("%s", s); - env->ReleaseStringUTFChars(js, s); + jstring_wrapper s(env, js); + XBT_CRITICAL("%s", s.value); } static void java_main(int argc, char* argv[]); JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_deployApplication(JNIEnv* env, jclass, jstring jdeploymentFile) { - const char *deploymentFile = env->GetStringUTFChars(jdeploymentFile, 0); + jstring_wrapper deploymentFile(env, jdeploymentFile); simgrid_register_default(java_main); simgrid_load_deployment(deploymentFile); @@ -245,11 +221,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit() { sg_host_energy_plugin_init(); } -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(); } @@ -274,8 +245,7 @@ static void run_jprocess(JNIEnv *env, jobject jprocess) if (env->ExceptionOccurred()) { XBT_DEBUG("Something went wrong in this Java actor, forget about it."); env->ExceptionClear(); - XBT_ATTRIB_UNUSED jint error = __java_vm->DetachCurrentThread(); - xbt_assert(error == JNI_OK, "Cannot detach failing thread"); + xbt_assert(__java_vm->DetachCurrentThread() == JNI_OK, "Cannot detach failing thread"); simgrid::ForcefulKillException::do_throw(); } } @@ -284,8 +254,7 @@ static void run_jprocess(JNIEnv *env, jobject jprocess) static void java_main(int argc, char* argv[]) { JNIEnv *env = get_current_thread_env(); - simgrid::kernel::context::JavaContext* context = - static_cast(simgrid::kernel::context::Context::self()); + auto* context = static_cast(simgrid::kernel::context::Context::self()); //Change the "." in class name for "/". std::string arg0 = argv[0]; @@ -299,8 +268,8 @@ static void java_main(int argc, char* argv[]) //Retrieve the name of the process. jstring jname = env->NewStringUTF(argv[0]); //Build the arguments - jobjectArray args = static_cast(env->NewObjectArray(argc - 1, env->FindClass("java/lang/String"), - env->NewStringUTF(""))); + auto args = static_cast( + 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. @@ -311,13 +280,13 @@ static void java_main(int argc, char* argv[]) xbt_assert((jprocess != nullptr), "Process allocation failed."); jprocess = env->NewGlobalRef(jprocess); //bind the process to the context - const_sg_actor_t process = sg_actor_self(); + const_sg_actor_t actor = sg_actor_self(); context->jprocess_ = jprocess; /* sets the PID and the PPID of the process */ - env->SetIntField(jprocess, jprocess_field_Process_pid, static_cast(MSG_process_get_PID(process))); - env->SetIntField(jprocess, jprocess_field_Process_ppid, static_cast(MSG_process_get_PPID(process))); - jprocess_bind(jprocess, process, env); + env->SetIntField(jprocess, jprocess_field_Process_pid, static_cast(actor->get_pid())); + env->SetIntField(jprocess, jprocess_field_Process_ppid, static_cast(actor->get_ppid())); + jprocess_bind(jprocess, actor, env); run_jprocess(env, context->jprocess_); } @@ -330,11 +299,12 @@ namespace context { void java_main_jprocess(jobject jprocess) { JNIEnv *env = get_current_thread_env(); - simgrid::kernel::context::JavaContext* context = - static_cast(simgrid::kernel::context::Context::self()); - context->jprocess_ = jprocess; - jprocess_bind(context->jprocess_, MSG_process_self(), env); + auto* context = static_cast(Context::self()); + context->jprocess_ = jprocess; + jprocess_bind(context->jprocess_, sg_actor_self(), env); run_jprocess(env, context->jprocess_); } -}}} +} // namespace context +} // namespace kernel +} // namespace simgrid