X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8cf6e30af8de6686461b6b1b52ba578df01de985..0f83a8218acedbbea411208a0a9bf89c4aca9455:/src/bindings/java/jmsg_vm.cpp

diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp
index 31a61a6091..f34af4f528 100644
--- a/src/bindings/java/jmsg_vm.cpp
+++ b/src/bindings/java/jmsg_vm.cpp
@@ -1,23 +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 <xbt/ex.hpp>
-
-#include "jmsg.h"
 #include "jmsg_vm.h"
 #include "jmsg_host.h"
-#include "jmsg_process.h"
 #include "jxbt_utilities.h"
-#include "simgrid/msg.h"
-#include <surf/surf_routing.h>
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "xbt/ex.hpp"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+SG_BEGIN_DECL()
 
+extern int JAVA_HOST_LEVEL;
 static jfieldID jvm_field_bind;
 
 void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm)
@@ -34,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)
@@ -75,12 +71,50 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jvm,
   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(host, name, static_cast<int>(jramsize), static_cast<int>(jmig_netspeed),
                               static_cast<int>(jdp_intensity));
+  env->ReleaseStringUTFChars(jname, name);
 
   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 jobjectArray JNICALL Java_org_simgrid_msg_VM_all(JNIEnv* env, jclass cls_arg)
+{
+  xbt_dynar_t hosts = MSG_hosts_as_dynar();
+  std::vector<jobject> vms;
+
+  unsigned int it;
+  msg_host_t h;
+  xbt_dynar_foreach (hosts, it, h) {
+    simgrid::s4u::VirtualMachine* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(h);
+    if (vm != nullptr && vm->getState() != SURF_VM_STATE_DESTROYED) {
+      jobject jvm = static_cast<jobject>(vm->extension(JAVA_HOST_LEVEL));
+      vms.push_back(jvm);
+    }
+  }
+  xbt_dynar_free(&hosts);
+
+  vms.shrink_to_fit();
+  int count = vms.size();
+
+  jclass cls = jxbt_get_class(env, "org/simgrid/msg/VM");
+  if (!cls)
+    return nullptr;
+
+  jobjectArray jtable = env->NewObjectArray((jsize)count, cls, nullptr);
+  if (!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)
@@ -98,10 +132,16 @@ 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);
@@ -126,3 +166,25 @@ 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, bprintf("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 (!host) { /* invalid name */
+    jxbt_throw_host_not_found(env, name);
+    env->ReleaseStringUTFChars(jname, name);
+    return nullptr;
+  }
+  env->ReleaseStringUTFChars(jname, name);
+
+  return static_cast<jobject>(host->extension(JAVA_HOST_LEVEL));
+}
+SG_END_DECL()