/* Functions related to the MSG VM API. */
-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "jmsg_host.h"
#include "jmsg_process.h"
#include "jxbt_utilities.h"
-#include "msg/msg.h"
+#include "simgrid/msg.h"
+#include <surf/surf_routing.h>
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
static jfieldID jvm_field_bind;
}
JNIEXPORT void JNICALL
-Java_org_simgrid_msg_VM_destroy(JNIEnv *env, jobject jvm) {
+Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm) {
msg_vm_t vm = jvm_get_native(env,jvm);
MSG_vm_destroy(vm);
}
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_ANONYMOUS{
- jxbt_throw_host_failure(env, (char*)"during migration");
+ } CATCH(e){
+ XBT_INFO("CATCH EXCEPTION MIGRATION %s",e.msg);
+ xbt_ex_free(e);
+ jxbt_throw_host_failure(env, (char*)"during migration");
}
}