X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bfdc9a38c22af6a9becf133be154a2fa2bc6589..7ef2735c5dafe6726c713539188933270ee8534c:/src/bindings/java/surf.i

diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i
index 70006b3936..3890a89ef0 100644
--- a/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@ -16,6 +16,7 @@ import org.simgrid.NativeLib;
 %}
 %pragma(java) jniclasscode=%{
   static {
+    NativeLib.nativeInit("simgrid");
     NativeLib.nativeInit("surf-java");
     Runtime.getRuntime().addShutdownHook(
       new Thread() {
@@ -166,15 +167,15 @@ JAVA_ARRAYSOFCLASSES(NetworkLink);
   long l = xbt_dynar_length($1);
   $result = jenv->NewDoubleArray(l);
   double *lout = (double *)xbt_dynar_to_array($1);
-  jenv->SetDoubleArrayRegion($result, 0, l, (const jdouble*)lout);
-  free(lout);
+  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);
-  jenv->SetDoubleArrayRegion($input, 0, l, (const jdouble*)lout);
+  jenv->SetDoubleArrayRegion($input, 0, l, (jdouble*)lout);
   free(lout);
 %}
 %typemap(javain) DoubleDynar "$javainput"
@@ -246,6 +247,8 @@ public:
   virtual void updateActionsStateFull(double now, double delta);
 
   virtual ActionList *getRunningActionSet();
+
+  virtual void addTraces()=0;
 };
 
 %feature("director") CpuModel;
@@ -253,13 +256,12 @@ class CpuModel : public Model {
 public:
   CpuModel(const char *name);
   virtual ~CpuModel();
-  virtual Cpu *createResource(const char *name, DoubleDynar power_peak,
+  virtual Cpu *createCpu(const char *name, DoubleDynar power_peak,
                               int pstate, double power_scale,
                               tmgr_trace *power_trace, int core,
                               e_surf_resource_state_t state_initial,
                               tmgr_trace *state_trace,
                               s_xbt_dict *cpu_properties)=0;
-  virtual void addTraces()=0;
 };
 
 class Resource {