rename the logging channel of java from 'jmsg' to 'java'

[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 608d9f8..616c054 100644 (file)
--- a/src/bindings/java/jmsg_vm.cpp
+++ b/src/bindings/java/jmsg_vm.cpp
@@ -1,20 +1,19 @@
-/* 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 <surf/surf_routing.h>
+#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()
 
 static jfieldID jvm_field_bind;
 
@@ -32,15 +31,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 +58,23 @@ 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)
-{
-  msg_vm_t vm = jvm_get_native(env,jvm);
-  return (jint) MSG_vm_is_saving(vm);
-}
-
-JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaved(JNIEnv * env, jobject jvm)
-{
-  msg_vm_t vm = jvm_get_native(env,jvm);
-  return (jint) MSG_vm_is_saved(vm);
-}
-
-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);
-}
-
 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);
 }
 
-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 void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv* env, jobject jvm, jobject jhost, jstring jname,
+                                                      jint jramsize, jint jmig_netspeed, jint jdp_intensity)
 {
   msg_host_t host = jhost_get_native(env, jhost);
 
-  const char *name;
-  name = env->GetStringUTFChars(jname, 0);
-  name = xbt_strdup(name);
-
-  // 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);
-
-  msg_vm_t vm = MSG_vm_create(host, name, (int) jncore, (int) jramsize, (int) jnetcap, NULL, (int) jdisksize,
-                              (int) jmig_netspeed, (int) jdp_intensity);
+  const char* name = env->GetStringUTFChars(jname, 0);
+  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_bind(env, jvm, vm);
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm)
@@ -121,19 +92,24 @@ 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)
 {
   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 +126,4 @@ 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)
-{
-  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);
-}
+SG_END_DECL()