From 11ddbb70152e1a18e91d817671d5323e0bd8533d Mon Sep 17 00:00:00 2001 From: Jonathan Rouzaud-Cornabas Date: Wed, 12 Jun 2013 08:37:41 +0200 Subject: [PATCH] AS access from MSG layer --- examples/java/io/Node.java | 2 +- src/bindings/java/jmsg_vm.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/examples/java/io/Node.java b/examples/java/io/Node.java index a0e1f9547b..e0831dfff8 100644 --- a/examples/java/io/Node.java +++ b/examples/java/io/Node.java @@ -56,4 +56,4 @@ public class Node extends Process { read = file.read(10000000,1); Msg.info("Having read " + read + " on " + filename); } -} \ No newline at end of file +} diff --git a/src/bindings/java/jmsg_vm.c b/src/bindings/java/jmsg_vm.c index b131d23515..0980d909d6 100644 --- a/src/bindings/java/jmsg_vm.c +++ b/src/bindings/java/jmsg_vm.c @@ -115,20 +115,7 @@ Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm) { } } JNIEXPORT void JNICALL -<<<<<<< HEAD Java_org_simgrid_msg_VM_reboot(JNIEnv *env, jobject jvm) { -======= -Java_org_simgrid_msg_VM_restore(JNIEnv *env, jobject jvm) { - msg_vm_t vm = jvm_get_native(env,jvm); - MSG_vm_restore(vm); -} - - - -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_VM_get_pm(JNIEnv *env, jobject jvm) { - jobject jhost; ->>>>>>> db82f9e... Add AS support in MSG and java bindings msg_vm_t vm = jvm_get_native(env,jvm); xbt_ex_t e; TRY { -- 2.20.1