1000 lines in already enough in this file, let's kill dead code

[simgrid.git] / src / jmsg.c

diff --git a/src/jmsg.c b/src/jmsg.c
index 85ba6f5..dbe6099 100644 (file)
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -104,10 +104,9 @@ Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
   MSG_process_set_data(process,&process);
    
   /* release our reference to the process name (variable name becomes invalid) */
-  (*env)->ReleaseStringUTFChars(env, jname, name);
+  //FIXME : This line should be uncommented but with mac it doesn't work. BIG WARNING
+  //(*env)->ReleaseStringUTFChars(env, jname, name);
    
-
-
   /* bind the java process instance to the native process */
   jprocess_bind(jprocess, process, env);
 
@@ -280,9 +279,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 +297,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"));
 
 }
@@ -720,13 +725,11 @@ Java_org_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
 
   /* get the native task */
   m_task_t task = jtask_to_native_task(jtask_arg, env);
-  jobject jtask;
 
   if (!task) {
     jxbt_throw_notbound(env, "task", task);
     return;
   }
-  jtask = (jobject) MSG_task_get_data(task);
 
   MSG_error_t rv = MSG_task_destroy(task);
 
@@ -792,7 +795,6 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
     jval = (jstring) (*env)->GetObjectArrayElement(env, jargs, index);
     tmp = (*env)->GetStringUTFChars(env, jval, 0);
     argv[index + 1] = strdup(tmp);
-    //argv[index] = strdup(tmp);
     (*env)->ReleaseStringUTFChars(env, jval, tmp);
   }
 
@@ -810,7 +812,7 @@ JNIEXPORT void JNICALL
     JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
 {
   MSG_error_t rv;
-  int index;                    //xbt_fifo_item_t item = NULL;
+  int index;
   m_host_t *hosts;
   jobject jhost;