Process kills now seems to work. May need some additional checking ...

[simgrid.git] / src / jmsg.c

diff --git a/src/jmsg.c b/src/jmsg.c
index dbe6099..d359c1d 100644 (file)
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -176,9 +176,6 @@ Java_org_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
     return;
   }
 
-  /* delete the global reference */
-  jprocess_delete_global_ref(native_to_java_process(process), env);
-
   /* kill the native process (this wrapper is call by the destructor of the java 
    * process instance)
    */
@@ -751,7 +748,7 @@ Java_org_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
   MSG_error_t rv = MSG_task_execute(task);
 
   jxbt_check_res("MSG_task_execute()", rv,
-                 MSG_HOST_FAILURE | MSG_TASK_CANCELLED,
+                 MSG_HOST_FAILURE | MSG_TASK_CANCELED,
                  bprintf("while executing task %s",
                          MSG_task_get_name(task)));
 }
@@ -760,13 +757,6 @@ Java_org_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
  * Unsortable functions                                                        *
  ***************************************************************************************/
 
-
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
-{
-  return (jint) MSG_get_errno();
-}
-
 JNIEXPORT jdouble JNICALL
 Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
 {
@@ -837,13 +827,17 @@ JNIEXPORT void JNICALL
   }
 
   XBT_INFO("Clean native world");
-  /* cleanup native stuff */
-  rv = MSG_OK != MSG_clean();
+}
+JNIEXPORT void JNICALL
+    JNICALL Java_org_simgrid_msg_Msg_clean(JNIEnv * env, jclass cls)
+{
+  /* cleanup native stuff. Calling it is ... useless since leaking memory at the end of the simulation is a non-issue */
+  MSG_error_t rv = MSG_OK != MSG_clean();
   jxbt_check_res("MSG_clean()", rv, MSG_OK,
                  bprintf
                  ("unexpected error : MSG_clean() failed .. please report this bug "));
 }
-
+   
 JNIEXPORT jint JNICALL
 Java_org_simgrid_msg_MsgNative_processKillAll(JNIEnv * env, jclass cls,
                                           jint jresetPID)