plug two memleaks

[simgrid.git] / src / bindings / java / jmsg_vm.cpp

diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp
index 1c4d84e..f34af4f 100644 (file)
--- a/src/bindings/java/jmsg_vm.cpp
+++ b/src/bindings/java/jmsg_vm.cpp
@@ -11,10 +11,11 @@
 #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)
@@ -75,6 +76,45 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jvm,
   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)
@@ -101,7 +141,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm
   }
 }
 
-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,4 +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()