X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/bindings/java/jmsg_vm.cpp diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp index 70dc62c527..a9174bacfa 100644 --- a/src/bindings/java/jmsg_vm.cpp +++ b/src/bindings/java/jmsg_vm.cpp @@ -1,6 +1,6 @@ /* Functions related to the Virtual Machines. */ -/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2023. 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. */ @@ -8,24 +8,23 @@ #include "jmsg_vm.h" #include "jmsg_host.h" #include "jxbt_utilities.hpp" -#include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "xbt/ex.hpp" +#include "simgrid/Exception.hpp" +#include "simgrid/plugins/live_migration.h" +#include "src/kernel/resource/VirtualMachineImpl.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); -extern "C" { - extern int JAVA_HOST_LEVEL; static jfieldID jvm_field_bind; -void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm) +void jvm_bind(JNIEnv* env, jobject jvm, sg_vm_t vm) { env->SetLongField(jvm, jvm_field_bind, (intptr_t)vm); } -msg_vm_t jvm_get_native(JNIEnv *env, jobject jvm) +sg_vm_t jvm_get_native(JNIEnv* env, jobject jvm) { - return (msg_vm_t)(intptr_t)env->GetLongField(jvm, jvm_field_bind); + return (sg_vm_t)(intptr_t)env->GetLongField(jvm, jvm_field_bind); } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cls) @@ -35,68 +34,66 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cl xbt_assert(jvm_field_bind, "Native initialization of msg/VM failed. Please report that bug"); } -JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv * env, jobject jvm) +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv* env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - return MSG_vm_is_created(vm); + const_sg_vm_t vm = jvm_get_native(env, jvm); + return sg_vm_is_created(vm); } -JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv * env, jobject jvm) +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv* env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - return (jint) MSG_vm_is_running(vm); + const_sg_vm_t vm = jvm_get_native(env, jvm); + return sg_vm_is_running(vm); } -JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv * env, jobject jvm) +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv* env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - return (jint) MSG_vm_is_migrating(vm); + const_sg_vm_t vm = jvm_get_native(env, jvm); + return sg_vm_is_migrating(vm); } -JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv * env, jobject jvm) +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv* env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - return (jint) MSG_vm_is_suspended(vm); + const_sg_vm_t vm = jvm_get_native(env, jvm); + return sg_vm_is_suspended(vm); } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound) { - msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_set_bound(vm, bound); + sg_vm_t vm = jvm_get_native(env, jvm); + sg_vm_set_bound(vm, bound); } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jVm, jobject jHost, jstring jname, jint coreAmount, jint jramsize, jint jmig_netspeed, jint jdp_intensity) { - msg_host_t host = jhost_get_native(env, jHost); + sg_host_t host = jhost_get_native(env, jHost); - const char* name = env->GetStringUTFChars(jname, 0); - msg_vm_t vm = MSG_vm_create(host, name, static_cast(coreAmount), static_cast(jramsize), - static_cast(jmig_netspeed), static_cast(jdp_intensity)); - env->ReleaseStringUTFChars(jname, name); + jstring_wrapper name(env, jname); + sg_vm_t vm = sg_vm_create_migratable(host, name, static_cast(coreAmount), static_cast(jramsize), + static_cast(jmig_netspeed), static_cast(jdp_intensity)); jvm_bind(env, jVm, vm); jVm = env->NewGlobalRef(jVm); // We use the extension level of the host, even if that's somehow disturbing - vm->extension_set(JAVA_HOST_LEVEL, (void*)jVm); + vm->extension_set(JAVA_HOST_LEVEL, jVm); } JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass cls_arg) { - xbt_dynar_t hosts = MSG_hosts_as_dynar(); + sg_host_t* hosts = sg_host_list(); + size_t host_count = sg_host_count(); std::vector vms; - unsigned int it; - msg_host_t h; - xbt_dynar_foreach (hosts, it, h) { - simgrid::s4u::VirtualMachine* vm = dynamic_cast(h); - if (vm != nullptr && vm->getState() != SURF_VM_STATE_DESTROYED) { - jobject jvm = static_cast(vm->extension(JAVA_HOST_LEVEL)); + for (size_t i = 0; i < host_count; i++) { + const auto* vm = dynamic_cast(hosts[i]); + if (vm != nullptr && vm->get_state() != simgrid::s4u::VirtualMachine::State::DESTROYED) { + auto jvm = static_cast(vm->extension(JAVA_HOST_LEVEL)); vms.push_back(jvm); } } - xbt_dynar_free(&hosts); + xbt_free(hosts); vms.shrink_to_fit(); int count = vms.size(); @@ -120,70 +117,70 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass c JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_destroy(vm); + sg_vm_t vm = jvm_get_native(env, jvm); + sg_vm_destroy(vm); } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_start(vm); + sg_vm_t vm = jvm_get_native(env, jvm); + sg_vm_start(vm); } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); + sg_vm_t vm = jvm_get_native(env, jvm); + if (vm) + sg_vm_shutdown(vm); +} + +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_destroy(JNIEnv* env, jobject jvm) +{ + sg_vm_t vm = jvm_get_native(env, jvm); if (vm) { - MSG_vm_shutdown(vm); - auto vmList = &simgrid::vm::VirtualMachineImpl::allVms_; + sg_vm_destroy(vm); + auto* vmList = &simgrid::kernel::resource::VirtualMachineImpl::allVms_; vmList->erase(std::remove(vmList->begin(), vmList->end(), vm), vmList->end()); } } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeMigration(JNIEnv* env, jobject jvm, jobject jhost) { - msg_vm_t vm = jvm_get_native(env,jvm); - msg_host_t host = jhost_get_native(env, jhost); - try { - MSG_vm_migrate(vm,host); - } - catch(xbt_ex& e){ - XBT_VERB("CATCH EXCEPTION MIGRATION %s",e.what()); - jxbt_throw_host_failure(env, (char*)"during migration"); + sg_vm_t vm = jvm_get_native(env, jvm); + sg_host_t host = jhost_get_native(env, jhost); + if (not simgrid::ForcefulKillException::try_n_catch([&vm, &host]() { sg_vm_migrate(vm, host); })) { + XBT_VERB("Caught exception during migration"); + jxbt_throw_host_failure(env, " during migration"); } } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_suspend(vm); + sg_vm_t vm = jvm_get_native(env, jvm); + sg_vm_suspend(vm); } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_resume(vm); + sg_vm_t vm = jvm_get_native(env, jvm); + sg_vm_resume(vm); } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_VM_getVMByName(JNIEnv* env, jclass cls, jstring jname) { - /* get the C string from the java string */ if (jname == nullptr) { jxbt_throw_null(env, "No VM can have a null name"); return nullptr; } - const char* name = env->GetStringUTFChars(jname, 0); + jstring_wrapper name(env, jname); /* get the VM by name (VMs are just special hosts, unfortunately) */ - msg_host_t host = MSG_host_by_name(name); + auto const* host = sg_host_by_name(name); if (not host) { /* invalid name */ jxbt_throw_host_not_found(env, name); - env->ReleaseStringUTFChars(jname, name); return nullptr; } - env->ReleaseStringUTFChars(jname, name); return static_cast(host->extension(JAVA_HOST_LEVEL)); } -}