X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7410b72db09489e8b9d3ee3cb087f35882397d93..0ba0b5da8a4948ab678226c4456f97b9b85a71c6:/src/bindings/java/jmsg_vm.cpp diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp index 608d9f8248..b570d72103 100644 --- a/src/bindings/java/jmsg_vm.cpp +++ b/src/bindings/java/jmsg_vm.cpp @@ -1,21 +1,21 @@ -/* 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-2017. 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 "jmsg.h" #include "jmsg_vm.h" #include "jmsg_host.h" -#include "jmsg_process.h" #include "jxbt_utilities.h" -#include "simgrid/msg.h" -#include +#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "xbt/ex.hpp" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); +SG_BEGIN_DECL() + +extern int JAVA_HOST_LEVEL; static jfieldID jvm_field_bind; void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm) @@ -32,15 +32,13 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cl { jclass jprocess_class_VM = env->FindClass("org/simgrid/msg/VM"); jvm_field_bind = jxbt_get_jfield(env, jprocess_class_VM, "bind", "J"); - if (!jvm_field_bind ) { - jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug.")); - } + 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) { 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) @@ -61,49 +59,63 @@ JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv * env, jobject return (jint) MSG_vm_is_suspended(vm); } -JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaving(JNIEnv * env, jobject jvm) +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound) { msg_vm_t vm = jvm_get_native(env,jvm); - return (jint) MSG_vm_is_saving(vm); + MSG_vm_set_bound(vm, bound); } -JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaved(JNIEnv * env, jobject jvm) +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_vm_t vm = jvm_get_native(env,jvm); - return (jint) MSG_vm_is_saved(vm); -} + msg_host_t host = jhost_get_native(env, jHost); -JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRestoring(JNIEnv * env, jobject jvm) -{ - msg_vm_t vm = jvm_get_native(env,jvm); - return (jint) MSG_vm_is_restoring(vm); -} + 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); -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); + jvm_bind(env, jVm, vm); + jVm = env->NewWeakGlobalRef(jVm); + // We use the extension level of the host, even if that's somehow disturbing + vm->extension_set(JAVA_HOST_LEVEL, (void*)jVm); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv *env, jobject jvm, jobject jhost, jstring jname, - jint jncore, jint jramsize, jint jnetcap, jstring jdiskpath, - jint jdisksize, jint jmig_netspeed, jint jdp_intensity) +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass cls_arg) { - msg_host_t host = jhost_get_native(env, jhost); + xbt_dynar_t hosts = MSG_hosts_as_dynar(); + std::vector vms; - const char *name; - name = env->GetStringUTFChars(jname, 0); - name = xbt_strdup(name); + 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)); + vms.push_back(jvm); + } + } + xbt_dynar_free(&hosts); + + vms.shrink_to_fit(); + int count = vms.size(); - // TODO disk concerns are not taken into account yet - // const char *diskpath; - // disk_path = (*env)->GetStringUTFChars(env, jdiskpath, 0); - // disk_path = xbt_strdup(disk_path); + jclass cls = jxbt_get_class(env, "org/simgrid/msg/VM"); + if (not cls) + return nullptr; - msg_vm_t vm = MSG_vm_create(host, name, (int) jncore, (int) jramsize, (int) jnetcap, NULL, (int) jdisksize, - (int) jmig_netspeed, (int) jdp_intensity); + jobjectArray jtable = env->NewObjectArray((jsize)count, cls, nullptr); + if (not jtable) { + jxbt_throw_jni(env, "Hosts table allocation failed"); + return nullptr; + } - jvm_bind(env,jvm,vm); + 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) @@ -121,19 +133,26 @@ 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); + auto vmList = &simgrid::vm::VirtualMachineImpl::allVms_; + vmList->erase( + std::remove_if(vmList->begin(), vmList->end(), [vm](simgrid::s4u::VirtualMachine* it) { + return vm == it; + }), + 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); - xbt_ex_t e; - TRY{ + try { MSG_vm_migrate(vm,host); - } CATCH(e){ - XBT_VERB("CATCH EXCEPTION MIGRATION %s",e.msg); - xbt_ex_free(e); + } + catch(xbt_ex& e){ + XBT_VERB("CATCH EXCEPTION MIGRATION %s",e.what()); jxbt_throw_host_failure(env, (char*)"during migration"); } } @@ -150,14 +169,25 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm) MSG_vm_resume(vm); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_save(JNIEnv *env, jobject jvm) +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_VM_getVMByName(JNIEnv* env, jclass cls, jstring jname) { - msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_save(vm); -} -JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_restore(JNIEnv *env, jobject jvm) -{ - msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_restore(vm); + /* 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)); } +SG_END_DECL()