[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 a9e121e..43d2c27 100644 (file)
--- a/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@ -16,8 +16,7 @@ import org.simgrid.NativeLib;
 %}
 %pragma(java) jniclasscode=%{
   static {
-    NativeLib.nativeInit("simgrid");
-    NativeLib.nativeInit("surf-java");
+    org.simgrid.NativeLib.nativeInit();    
     Runtime.getRuntime().addShutdownHook(
       new Thread() {
         public void run() {
@@ -121,7 +120,7 @@ JAVA_ARRAYSOFCLASSES(Action);
   jlong *elts = jenv->GetLongArrayElements($result, NULL);
   l = 0;
   for(ActionList::iterator it($1->begin()), itend($1->end()); it != itend ; ++it) {
-    elts[l++] = (jlong)static_cast<ActionPtr>(&*it);
+    elts[l++] = (jlong)static_cast<Action*>(&*it);
   }
   jenv->ReleaseLongArrayElements($result, elts, 0);
 }
@@ -166,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}
@@ -236,8 +233,8 @@ struct tmgr_trace_event {
 %nodefaultctor Model;
 class Model {
 public:
-  Model(const char *name);
-  const char *getName();
+  Model();
+  
   virtual double shareResources(double now);
   virtual double shareResourcesLazy(double now);
   virtual double shareResourcesFull(double now);
@@ -254,7 +251,7 @@ public:
 %feature("director") CpuModel;
 class CpuModel : public Model {
 public:
-  CpuModel(const char *name);
+  CpuModel();
   virtual ~CpuModel();
   virtual Cpu *createCpu(const char *name, DoubleDynar power_peak,
                               int pstate, double power_scale,