ensures that the native libraries are always loaded before trying to access them

[simgrid.git] / org / simgrid / msg / Comm.java

diff --git a/org/simgrid/msg/Comm.java b/org/simgrid/msg/Comm.java
index 3ef08e3..63e6d1e 100644 (file)
--- a/org/simgrid/msg/Comm.java
+++ b/org/simgrid/msg/Comm.java
@@ -15,17 +15,21 @@ public class Comm {
        /**
         * Indicates if the communication is a receiving communication
         */
-       boolean receiving;
+       protected boolean receiving;
+       /**
+        * Indicates if the communication is finished
+        */
+       protected boolean finished = false;
        /**
         * Represents the bind between the java comm and the
         * native C comm. You must never access it, since it is 
         * automatically set.
         */
-       public long bind = 0;
+       private long bind = 0;
        /**
         * Represents the bind for the task object pointer. Don't touch it.
         */
-       public long taskBind = 0;
+       private long taskBind = 0;
        /**
         * Task associated with the comm. Beware, it can be null 
         */
@@ -46,18 +50,26 @@ public class Comm {
        /**
         * Unbind the communication object
         */
-       public native void destroy() throws NativeException;
+       protected native void destroy() throws NativeException;
        /**
         * Returns if the communication is finished or not.
         * If the communication has finished and there was an error,
         * raise an exception.
         */
        public native boolean test() throws TransferFailureException, HostFailureException, TimeoutException ;
+       /**
+        * Wait for the complemetion of the communication for an indefinite time
+        */
+       public void waitCompletion() throws TransferFailureException, HostFailureException, TimeoutException {
+               waitCompletion(-1);
+       }
        /**
         * Wait for the completion of the communication.
         * Throws an exception if there were an error in the communication.
+        * @param timeout Time before giving up
         */
        public native void waitCompletion(double timeout) throws TransferFailureException, HostFailureException, TimeoutException;
+               
        /**
         * Returns the task associated with the communication.
         * if the communication isn't finished yet, will return null.
@@ -71,6 +83,7 @@ public class Comm {
         */
        public static native void nativeInit();
        static {
+               Msg.nativeInit();
                nativeInit();
        }       
 }