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

diff --git a/org/simgrid/msg/Comm.java b/org/simgrid/msg/Comm.java
index 66d264c..63e6d1e 100644 (file)
--- a/org/simgrid/msg/Comm.java
+++ b/org/simgrid/msg/Comm.java
@@ -83,6 +83,7 @@ public class Comm {
         */
        public static native void nativeInit();
        static {
+               Msg.nativeInit();
                nativeInit();
        }       
 }

diff --git a/org/simgrid/msg/File.java b/org/simgrid/msg/File.java
index fa42c6d..9076bcf 100644 (file)
--- a/org/simgrid/msg/File.java
+++ b/org/simgrid/msg/File.java
@@ -61,6 +61,7 @@ public class File {
         */
        public static native void nativeInit();
        static {
+               Msg.nativeInit();
                nativeInit();
        }       
 }
\ No newline at end of file

diff --git a/org/simgrid/msg/Msg.java b/org/simgrid/msg/Msg.java
index ba290f8..d722813 100644 (file)
--- a/org/simgrid/msg/Msg.java
+++ b/org/simgrid/msg/Msg.java
@@ -19,7 +19,10 @@ import java.io.File;
 
 public final class Msg {
        /* Statically load the library which contains all native functions used in here */
-       static {
+       static private boolean isNativeInited = false;
+       public static void nativeInit() {
+               if (isNativeInited)
+                       return;
                try {
                        /* prefer the version on disk, if existing */
                        System.loadLibrary("SG_java");
@@ -28,6 +31,10 @@ public final class Msg {
                        loadLib("simgrid");
                        loadLib("SG_java");
                }
+               isNativeInited = true;
+       }
+       static {
+               nativeInit();
        }
        private static void loadLib (String name) {
                String Path = "NATIVE/"+System.getProperty("os.name")+"/"+System.getProperty("os.arch")+"/";

diff --git a/org/simgrid/msg/Mutex.java b/org/simgrid/msg/Mutex.java
index 7032b6e..cb16ffb 100644 (file)
--- a/org/simgrid/msg/Mutex.java
+++ b/org/simgrid/msg/Mutex.java
@@ -31,6 +31,7 @@ public class Mutex {
         */
        public static native void nativeInit();
        static {
+               Msg.nativeInit();
                nativeInit();
        }       
 }

diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java
index 9d9065a..edde2bf 100644 (file)
--- a/org/simgrid/msg/Process.java
+++ b/org/simgrid/msg/Process.java
@@ -10,10 +10,7 @@
 package org.simgrid.msg;
  
 import java.util.Arrays;
-import java.util.Hashtable;
 import java.util.Vector;
-import java.lang.Runnable;
-import java.util.concurrent.Semaphore;
 
 /**
  * A process may be defined as a code, with some private data, executing 
@@ -404,6 +401,7 @@ public abstract class Process implements Runnable {
         */
        public static native void nativeInit();
        static {
+               Msg.nativeInit();
                nativeInit();
        }
        /**

diff --git a/org/simgrid/msg/RngStream.java b/org/simgrid/msg/RngStream.java
index c9f5471..58b9c9e 100644 (file)
--- a/org/simgrid/msg/RngStream.java
+++ b/org/simgrid/msg/RngStream.java
@@ -113,6 +113,7 @@ public class RngStream {
         */
        public static native void nativeInit();
        static {
+               Msg.nativeInit();
                nativeInit();
        }
 }
\ No newline at end of file

diff --git a/org/simgrid/msg/Task.java b/org/simgrid/msg/Task.java
index 84eaf88..a81e8fc 100644 (file)
--- a/org/simgrid/msg/Task.java
+++ b/org/simgrid/msg/Task.java
@@ -277,6 +277,7 @@ public class Task {
         */
        public static native void nativeInit();
        static {
+               Msg.nativeInit();
                nativeInit();
        }
 }

diff --git a/org/simgrid/trace/Trace.java b/org/simgrid/trace/Trace.java
index daeed7d..6b51d85 100644 (file)
--- a/org/simgrid/trace/Trace.java
+++ b/org/simgrid/trace/Trace.java
@@ -13,6 +13,7 @@ package org.simgrid.trace;
 public final class Trace {
        /* Statically load the library which contains all native functions used in here */
        static {
+               Msg.nativeInit();
                try {
                        System.loadLibrary("SG_java_tracing");
                } catch(UnsatisfiedLinkError e) {