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

diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp
index 0258585ae1..31a61a6091 100644
--- a/src/bindings/java/jmsg_vm.cpp
+++ b/src/bindings/java/jmsg_vm.cpp
@@ -6,6 +6,8 @@
 /* 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"
@@ -18,185 +20,109 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
 static jfieldID jvm_field_bind;
 
-void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm) {
+void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm)
+{
   env->SetLongField(jvm, jvm_field_bind, (intptr_t)vm);
 }
-msg_vm_t jvm_get_native(JNIEnv *env, jobject jvm) {
+
+msg_vm_t jvm_get_native(JNIEnv *env, jobject jvm)
+{
   return (msg_vm_t)(intptr_t)env->GetLongField(jvm, jvm_field_bind);
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cls) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cls)
+{
   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	) {
+  if (!jvm_field_bind  ) {
     jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug."));
   }
 }
 
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isCreated(JNIEnv * env, jobject jvm) {
+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);
 }
 
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isRunning(JNIEnv * env, jobject jvm) {
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv * env, jobject jvm)
+{
   msg_vm_t vm = jvm_get_native(env,jvm);
   return (jint) MSG_vm_is_running(vm);
 }
 
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isMigrating(JNIEnv * env, jobject jvm) {
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv * env, jobject jvm)
+{
   msg_vm_t vm = jvm_get_native(env,jvm);
   return (jint) MSG_vm_is_migrating(vm);
 }
 
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_VM_isSuspended(JNIEnv * env, jobject jvm) {
+JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv * env, jobject jvm)
+{
   msg_vm_t vm = jvm_get_native(env,jvm);
   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) {
+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_restoring(vm);
-}
-
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jint load) { 
-
-	msg_vm_t vm = jvm_get_native(env,jvm);
-	double bound = MSG_get_host_speed(vm) * load / 100;
-	MSG_vm_set_bound(vm, bound); 
+  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);
+  const char* 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);
+  msg_vm_t vm = MSG_vm_create(host, name, static_cast<int>(jramsize), static_cast<int>(jmig_netspeed),
+                              static_cast<int>(jdp_intensity));
 
-  jvm_bind(env,jvm,vm);
+  jvm_bind(env, jvm, vm);
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm)
+{
   msg_vm_t vm = jvm_get_native(env,jvm);
   MSG_vm_destroy(vm);
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm)
+{
   msg_vm_t vm = jvm_get_native(env,jvm);
   MSG_vm_start(vm);
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_shutdown(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);
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_internalmig(JNIEnv *env, jobject jvm, jobject jhost) {
+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{
-  MSG_vm_migrate(vm,host);
-  } CATCH(e){
-     XBT_INFO("CATCH EXCEPTION MIGRATION %s",e.msg);
-     xbt_ex_free(e);
+  try {
+    MSG_vm_migrate(vm,host);
+  }
+  catch(xbt_ex& e){
+     XBT_VERB("CATCH EXCEPTION MIGRATION %s",e.what());
      jxbt_throw_host_failure(env, (char*)"during migration");
-  } 
+  }
 }
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm)
+{
   msg_vm_t vm = jvm_get_native(env,jvm);
   MSG_vm_suspend(vm);
 }
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm) {
-  msg_vm_t vm = jvm_get_native(env,jvm);
-  MSG_vm_resume(vm);
-}
 
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_save(JNIEnv *env, jobject jvm) {
+JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(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);
+  MSG_vm_resume(vm);
 }
 
-
-
-JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_VM_get_pm(JNIEnv *env, jobject jvm) {
-  jobject jhost;
-  msg_vm_t vm = jvm_get_native(env,jvm);
-  msg_host_t host = MSG_vm_get_pm(vm);
-
-  if (!host->facet(JAVA_HOST_LEVEL)) {
-    /* the native host not yet associated with the java host instance */
-
-    /* instanciate a new java host instance */
-    jhost = jhost_new_instance(env);
-
-    if (!jhost) {
-      jxbt_throw_jni(env, "java host instantiation failed");
-      return NULL;
-    }
-
-    /* get a global reference to the newly created host */
-    jhost = jhost_ref(env, jhost);
-
-    if (!jhost) {
-      jxbt_throw_jni(env, "global ref allocation failed");
-      return NULL;
-    }
-    /* Sets the host name */
-    const char *name = MSG_host_get_name(host);
-    jobject jname = env->NewStringUTF(name);
-    env->SetObjectField(jhost, jxbt_get_jfield(env,
-      env->FindClass("org/simgrid/msg/Host"), "name", "Ljava/lang/String;"),
-      jname);
-    /* Bind & store it */
-    jhost_bind(jhost, host, env);
-    host->set_facet(JAVA_HOST_LEVEL, (void *) jhost);
-  } else {
-    jhost = (jobject) host->facet(JAVA_HOST_LEVEL);
-  }
-
-  return jhost;
-}