This commit concerned the reimplementation of the xbt context switch mechanism.

[simgrid.git] / src / java / simgrid / msg / Msg.java

diff --git a/src/java/simgrid/msg/Msg.java b/src/java/simgrid/msg/Msg.java
index 00384e7..7666926 100644 (file)
--- a/src/java/simgrid/msg/Msg.java
+++ b/src/java/simgrid/msg/Msg.java
@@ -83,9 +83,15 @@ public final class Msg {
      */
     static {
         try {
-            System.loadLibrary("simgrid4java");
+            System.loadLibrary("simgrid");
+            Msg.selectContextFactory("jcontext_factory");
+        } catch(NativeException e)
+        {
+                 System.err.println(e.toString());
+                 e.printStackTrace();
+                 System.exit(1);
         } catch(UnsatisfiedLinkError e){
-            System.err.println("Cannot load simgrid4java library : ");
+            System.err.println("Cannot load simgrid library : ");
             e.printStackTrace();
            System.err.println("Please check your LD_LIBRARY_PATH, "+
                               "or copy the library to the current directory");
@@ -93,6 +99,9 @@ public final class Msg {
         }
     }
     
+    final static native 
+    void selectContextFactory(String name) throws NativeException;
+    
     /******************************************************************
      * The natively implemented methods connected to the MSG Process  *
      ******************************************************************/