Merge scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java

[simgrid.git] / src / jmsg_process.c

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index 1fa964c..dc3d262 100644 (file)
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -216,7 +216,7 @@ Java_org_simgrid_msg_Process_currentProcess(JNIEnv * env, jclass cls)
 }
 
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Process_pause(JNIEnv * env,
+Java_org_simgrid_msg_Process_suspend(JNIEnv * env,
                                    jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -234,7 +234,7 @@ Java_org_simgrid_msg_Process_pause(JNIEnv * env,
 
 }
 JNIEXPORT void JNICALL
-Java_org_simgrid_msg_Process_restart(JNIEnv * env,
+Java_org_simgrid_msg_Process_resume(JNIEnv * env,
                                      jobject jprocess)
 {
   m_process_t process = jprocess_to_native_process(jprocess, env);
@@ -335,6 +335,8 @@ Java_org_simgrid_msg_Process_migrate(JNIEnv * env,
   /* change the host java side */
   (*env)->SetObjectField(env, jprocess, jprocess_field_Process_host, jhost);
 }
-
-
-
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , jobject jprocess, jdouble jkilltime) {
+       m_process_t process = jprocess_to_native_process(jprocess, env);
+       MSG_process_set_kill_time(process, (double)jkilltime);
+}