From 2959d30f87f56782d55ac870cd66b0f622a2925c Mon Sep 17 00:00:00 2001
From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 26 Apr 2011 14:00:45 +0000
Subject: [PATCH] Rename Process.changeHost to process.migrate to match the MSG
 API

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java@9890 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 org/simgrid/msg/MsgNative.java |  2 +-
 org/simgrid/msg/Process.java   |  5 +++--
 src/jmsg.c                     | 16 +++++++++++-----
 src/jmsg.h                     |  6 +++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/org/simgrid/msg/MsgNative.java b/org/simgrid/msg/MsgNative.java
index c278bb1379..b5f8765569 100644
--- a/org/simgrid/msg/MsgNative.java
+++ b/org/simgrid/msg/MsgNative.java
@@ -150,7 +150,7 @@ final class MsgNative {
 	 * @see                Process.migrate()
 	 * @see                Host.getByName()
 	 */
-	final static native void processChangeHost(Process process, Host host) ;
+	final static native void processMigrate(Process process, Host host) ;
 
 	/**
 	 * The natively implemented native to request the current process to sleep 
diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java
index 762dddb187..1c85cf0283 100644
--- a/org/simgrid/msg/Process.java
+++ b/org/simgrid/msg/Process.java
@@ -266,11 +266,12 @@ public abstract class Process extends Thread {
 	/**
 	 * Migrates a process to another host.
 	 *
+	 * @param process		The process to migrate.
 	 * @param host			The host where to migrate the process.
 	 *
 	 */
-	public void migrate(Host host)  {
-		MsgNative.processChangeHost(this, host);
+	public static void migrate(Process process, Host host)  {
+		MsgNative.processMigrate(process, host);
 	}
 	/**
 	 * Makes the current process sleep until time seconds have elapsed.
diff --git a/src/jmsg.c b/src/jmsg.c
index 85ba6f5a31..30b5c2a61a 100644
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -280,9 +280,16 @@ Java_org_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
-                                             jobject jhost)
+Java_org_simgrid_msg_MsgNative_processMigrate(JNIEnv * env, jclass cls,
+                                             jobject jprocess, jobject jhost)
 {
+  m_process_t process = jprocess_to_native_process(jprocess, env);
+
+  if (!process) {
+    jxbt_throw_notbound(env, "process", jprocess);
+    return;
+  }
+
   m_host_t host = jhost_get_native(env, jhost);
 
   if (!host) {
@@ -291,9 +298,8 @@ Java_org_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
   }
 
   /* try to change the host of the process */
-  MSG_error_t rv = MSG_process_change_host(host);
-
-  jxbt_check_res("MSG_process_change_host()", rv, MSG_OK,
+  MSG_error_t rv = MSG_process_migrate(process, host);
+  jxbt_check_res("MSG_process_migrate()", rv, MSG_OK,
                  bprintf("unexpected error , please report this bug"));
 
 }
diff --git a/src/jmsg.h b/src/jmsg.h
index 14e7650b14..8bf5a941f3 100644
--- a/src/jmsg.h
+++ b/src/jmsg.h
@@ -117,11 +117,11 @@ JNIEXPORT jint JNICALL Java_org_simgrid_msg_MsgNative_processSelfPPID
 
 /*
  * Class		simgrid_msg_Msg
- * Method		processChangeHost
+ * Method		processMigrate
  * Signature	(Lsimgrid/msg/Process;Lsimgrid/msg/Host;)V
  */
-JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_processChangeHost
-    (JNIEnv *, jclass, jobject);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_processMigrate
+    (JNIEnv *, jclass, jobject, jobject);
 
 /*
  * Class		simgrid_msg_Msg
-- 
2.20.1