Use MSG_init instead of MSG_global_init. Use MSG_vm_destroy.

diff --git a/src/jmsg.c b/src/jmsg.c
index a43e4f7..3e6fd62 100644 (file)
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -118,7 +118,7 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
   }
   argv[argc] = NULL;
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
 
   for (index = 0; index < argc; index++)
     free(argv[index]);

diff --git a/src/jmsg_vm.c b/src/jmsg_vm.c
index 3e0eb2c..ded41c8 100644 (file)
--- a/src/jmsg_vm.c
+++ b/src/jmsg_vm.c
@@ -37,8 +37,8 @@ Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm, jobject jhost, jint jcor
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_VM_destroy(JNIEnv *env, jobject jvm) {
-  /*msg_vm_t vm = jvm_get_native(env,jvm);
-  MSG_vm_destroy(vm);*/
+  msg_vm_t vm = jvm_get_native(env,jvm);
+  MSG_vm_destroy(vm);
 }
 JNIEXPORT jboolean JNICALL
 Java_org_simgrid_msg_VM_isSuspended(JNIEnv *env, jobject jvm) {