Bugfix in Process.waitFor and Process.sleep: Throw the expected

exception if failure.

diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java
index 5e1b4e6..abdd52c 100644 (file)
--- a/org/simgrid/msg/Process.java
+++ b/org/simgrid/msg/Process.java
@@ -310,7 +310,7 @@ public abstract class Process implements Runnable {
         * FIXME: Not optimal, maybe we should have two native functions.
         * @param millis the length of time to sleep in milliseconds.
         */
         * FIXME: Not optimal, maybe we should have two native functions.
         * @param millis the length of time to sleep in milliseconds.
         */

-       public static void sleep(long millis)  {
+       public static void sleep(long millis) throws HostFailureException  {

                sleep(millis,0);
        }
        /**
                sleep(millis,0);
        }
        /**


@@ -321,12 +321,12 @@ public abstract class Process implements Runnable {
         * @param millis the length of time to sleep in milliseconds.
         * @param nanos additionnal nanoseconds to sleep.
         */
         * @param millis the length of time to sleep in milliseconds.
         * @param nanos additionnal nanoseconds to sleep.
         */

-       public native static void sleep(long millis, int nanos);
+       public native static void sleep(long millis, int nanos) throws HostFailureException;

        /**
         * Makes the current process sleep until time seconds have elapsed.
         * @param seconds               The time the current process must sleep.
         */ 
        /**
         * Makes the current process sleep until time seconds have elapsed.
         * @param seconds               The time the current process must sleep.
         */ 

-       public native void waitFor(double seconds);    
+       public native void waitFor(double seconds) throws HostFailureException;    

        /**
      *
      */
        /**
      *
      */

diff --git a/src/jmsg_process.c b/src/jmsg_process.c
index 213b345..85c476f 100644 (file)
--- a/src/jmsg_process.c
+++ b/src/jmsg_process.c
@@ -267,8 +267,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep
        CATCH_ANONYMOUS {
                return;
        }
        CATCH_ANONYMOUS {
                return;
        }

-       jxbt_check_res("MSG_process_sleep()", rv, MSG_OK,
-                 bprintf("unexpected error , please report this bug"));
+  if (rv != MSG_OK) {
+       jmsg_throw_status(env,rv);
+  }

 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
 }
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,


@@ -288,7 +289,8 @@ Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
        return;
   }
   if (rv != MSG_OK) {
        return;
   }
   if (rv != MSG_OK) {

-//     smx_ctx_java_stop(smx_ctx_java_self());
+       XBT_INFO("Status NOK");
+       jmsg_throw_status(env,rv);

   }
 }
 
   }
 }