X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0424e24e1f270b3c65b20e994079679b18be3eb8..32892d0df7206a7c14ace5a13f985df1e0a9249a:/src/bindings/java/jmsg_vm.cpp diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp index 23b0c5ae19..9b04afbb90 100644 --- a/src/bindings/java/jmsg_vm.cpp +++ b/src/bindings/java/jmsg_vm.cpp @@ -1,23 +1,20 @@ -/* Functions related to the MSG VM API. */ +/* Functions related to the Virtual Machines. */ -/* Copyright (c) 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2012-2018. 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 - -#include "jmsg.h" #include "jmsg_vm.h" #include "jmsg_host.h" -#include "jmsg_process.h" -#include "jxbt_utilities.h" -#include "simgrid/msg.h" -#include +#include "jxbt_utilities.hpp" +#include "simgrid/Exception.hpp" +#include "simgrid/plugins/live_migration.h" +#include "src/plugins/vm/VirtualMachineImpl.hpp" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); +extern int JAVA_HOST_LEVEL; static jfieldID jvm_field_bind; void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm) @@ -40,7 +37,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cl JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv * env, jobject jvm) { msg_vm_t vm = jvm_get_native(env,jvm); - return (jint) MSG_vm_is_created(vm); + return MSG_vm_is_created(vm); } JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv * env, jobject jvm) @@ -67,18 +64,57 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm MSG_vm_set_bound(vm, bound); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jvm, jobject jhost, jstring jname, - jint jramsize, jint jmig_netspeed, jint jdp_intensity) +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); + msg_host_t host = jhost_get_native(env, jHost); const char* name = env->GetStringUTFChars(jname, 0); - name = xbt_strdup(name); + msg_vm_t vm = MSG_vm_create_migratable(host, name, static_cast(coreAmount), static_cast(jramsize), + static_cast(jmig_netspeed), static_cast(jdp_intensity)); + env->ReleaseStringUTFChars(jname, name); + + 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); +} + +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass cls_arg) +{ + xbt_dynar_t hosts = MSG_hosts_as_dynar(); + 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->get_state() != simgrid::s4u::VirtualMachine::state::DESTROYED) { + jobject jvm = static_cast(vm->extension(JAVA_HOST_LEVEL)); + vms.push_back(jvm); + } + } + xbt_dynar_free(&hosts); - msg_vm_t vm = MSG_vm_create(host, name, static_cast(jramsize), static_cast(jmig_netspeed), - static_cast(jdp_intensity)); + vms.shrink_to_fit(); + int count = vms.size(); - jvm_bind(env, jvm, vm); + jclass cls = jxbt_get_class(env, "org/simgrid/msg/VM"); + if (not cls) + return nullptr; + + jobjectArray jtable = env->NewObjectArray((jsize)count, cls, nullptr); + if (not jtable) { + jxbt_throw_jni(env, "Hosts table allocation failed"); + return nullptr; + } + + for (int index = 0; index < count; index++) { + jobject jhost = vms.at(index); + env->SetObjectArrayElement(jtable, index, jhost); + } + return jtable; } JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm) @@ -96,10 +132,21 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm) JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm) { msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_shutdown(vm); + if (vm) + MSG_vm_shutdown(vm); +} + +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_destroy(JNIEnv* env, jobject jvm) +{ + msg_vm_t vm = jvm_get_native(env, jvm); + if (vm) { + MSG_vm_destroy(vm); + auto* vmList = &simgrid::vm::VirtualMachineImpl::allVms_; + vmList->erase(std::remove(vmList->begin(), vmList->end(), vm), vmList->end()); + } } -JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_internalmig(JNIEnv *env, jobject jvm, jobject jhost) +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); @@ -124,3 +171,24 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm) MSG_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); + /* get the VM by name (VMs are just special hosts, unfortunately) */ + msg_host_t host = MSG_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)); +}