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

Conflicts:
	src/jmsg_process.c
	src/jmsg_process.h

diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java
index f8c1061..f9572c5 100644 (file)
--- a/org/simgrid/msg/Process.java
+++ b/org/simgrid/msg/Process.java
@@ -288,6 +288,12 @@ public abstract class Process implements Runnable {
        public int getPPID()  {
                return ppid;
        }
+       /**
+        * Set the kill time of the process
+        * @param killTime the time when the process is killed
+        */
+       public native void setKillTime(double killTime);
+       
        /**
         * This static method returns the currently running process.
         *

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index 1fa964c..78c88dc 100644 (file)
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -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);
+}

diff --git a/src/jmsg_process.h b/src/jmsg_process.h
index 3b87be6..3866ad9 100644 (file)
--- a/src/jmsg_process.h
+++ b/src/jmsg_process.h
@@ -150,7 +150,7 @@ Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls);
 /*
  * Class               org_simgrid_msg_Process
  * Method              create
- * Signature   (Lsimgrid/msg/Host;)V
+ * Signature   (Lorg/simgrid/msg/Host;)V
  */
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_create(JNIEnv * env,
@@ -168,7 +168,7 @@ JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll
 /*
  * Class               org_simgrid_msg_Process
  * Method              fromPID
- * Signature   (I)Lsimgrid/msg/Process;
+ * Signature   (I)Lorg/simgrid/msg/Process;
  */
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID
     (JNIEnv *, jclass, jint);
@@ -176,14 +176,14 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID
 /*
  * Class               org_simgrid_msg_Process
  * Method              currentProcess
- * Signature   ()Lsimgrid/msg/Process;
+ * Signature   ()Lorg/simgrid/msg/Process;
  */
 JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_currentProcess
     (JNIEnv *, jclass);
 /*
  * Class               org_simgrid_msg_Process
  * Method              pause
- * Signature   (Lsimgrid/msg/Process;)V
+ * Signature   (Lorg/simgrid/msg/Process;)V
  */
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_pause(JNIEnv * env,
@@ -191,14 +191,14 @@ Java_org_simgrid_msg_Process_pause(JNIEnv * env,
 /*
  * Class               org_simgrid_msg_Process
  * Method              restart
- * Signature   (Lsimgrid/msg/Process;)V
+ * Signature   (Lorg/simgrid/msg/Process;)V
  */
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart
     (JNIEnv *, jobject);
 /*
  * Class               org_simgrid_msg_Process
  * Method              isSuspended
- * Signature   (Lsimgrid/msg/Process;)Z
+ * Signature   (Lorg/simgrid/msg/Process;)Z
  */
 JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended
     (JNIEnv *, jobject);
@@ -220,7 +220,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor
 /*
  * Class               org_simgrid_msg_Process
  * Method              kill
- * Signature   (Lsimgrid/msg/Process;)V
+ * Signature   (Lorg/simgrid/msg/Process;)V
  */
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill
     (JNIEnv *, jobject);
@@ -228,9 +228,16 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill
 /*
  * Class               org_simgrid_msg_Process
  * Method              migrate
- * Signature   (Lsimgrid/msg/Host;)V
+ * Signature   (Lorg/simgrid/msg/Host;)V
  */
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate
     (JNIEnv *, jobject, jobject);
+/*
+ * Class               org_simgrid_msg_Process
+ * Method              setKillTime
+ * Signature   (D)V
+ */
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime
+    (JNIEnv *, jobject, jdouble);
 
 #endif                          /* !MSG_JPROCESS_H */