[surf] Remove sg_trace_connect_cb

[simgrid.git] / src / bindings / java / surf.i

diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i
index f5ef709..43d2c27 100644 (file)
--- a/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@ -16,10 +16,7 @@ import org.simgrid.NativeLib;
 %}
 %pragma(java) jniclasscode=%{
   static {
-    if (System.getProperty("os.name").toLowerCase().startsWith("win"))
-        NativeLib.nativeInit("winpthread");
-    NativeLib.nativeInit("simgrid");
-    NativeLib.nativeInit("surf-java");
+    org.simgrid.NativeLib.nativeInit();    
     Runtime.getRuntime().addShutdownHook(
       new Thread() {
         public void run() {
@@ -168,17 +165,15 @@ JAVA_ARRAYSOFCLASSES(Link);
 %typemap(out) DoubleDynar {
   long l = xbt_dynar_length($1);
   $result = jenv->NewDoubleArray(l);
-  double *lout = (double *)xbt_dynar_to_array($1);
+  double *lout = (double *) xbt_dynar_get_ptr($1, 0);
   jenv->SetDoubleArrayRegion($result, 0, l, (jdouble*)lout);
-  free(:);
 }
 %typemap(javadirectorin) DoubleDynar "$jniinput"
 %typemap(directorin,descriptor="[D") DoubleDynar %{
   long l = xbt_dynar_length($1);
   $input = jenv->NewDoubleArray(l);
-  double *lout = (double *)xbt_dynar_to_array($1);
+  double *lout = (double *) xbt_dynar_get_ptr($1, 0);
   jenv->SetDoubleArrayRegion($input, 0, l, (jdouble*)lout);
-  free(lout);
 %}
 %typemap(javain) DoubleDynar "$javainput"
 %typemap(javaout) DoubleDynar {return  $jnicall}