[surf] Don't free power_peak from the caller

[simgrid.git] / src / bindings / java / org / simgrid / surf / surfJAVA_wrap.cxx

diff --git a/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx b/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
index 4c0dfa4..1633eb0 100644 (file)
--- a/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
+++ b/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
@@ -1348,7 +1348,7 @@ void SwigDirector_Plugin::swig_connect_director(JNIEnv *jenv, jobject jself, jcl
 }
 
 
-SwigDirector_CpuModel::SwigDirector_CpuModel(JNIEnv *jenv, char const *name) : CpuModel(name), Swig::Director(jenv) {
+SwigDirector_CpuModel::SwigDirector_CpuModel(JNIEnv *jenv) : CpuModel(), Swig::Director(jenv) {
 }
 
 double SwigDirector_CpuModel::shareResources(double now) {
@@ -1568,9 +1568,8 @@ Cpu *SwigDirector_CpuModel::createCpu(char const *name, DoubleDynar power_peak,
     
     long l = xbt_dynar_length(power_peak);
     jpower_peak = jenv->NewDoubleArray(l);
-    double *lout = (double *)xbt_dynar_to_array(power_peak);
+    double *lout = (double *) xbt_dynar_get_ptr(power_peak, 0);
     jenv->SetDoubleArrayRegion(jpower_peak, 0, l, (jdouble*)lout);
-    free(lout);
     
     jpstate = (jint) pstate;
     jpower_scale = (jdouble) power_scale;
@@ -2835,21 +2834,6 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_delete_1TmgrTraceEvent(JNI
 }
 
 
-SWIGEXPORT jstring JNICALL Java_org_simgrid_surf_SurfJNI_Model_1getName(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
-  jstring jresult = 0 ;
-  Model *arg1 = (Model *) 0 ;
-  char *result = 0 ;
-  
-  (void)jenv;
-  (void)jcls;
-  (void)jarg1_;
-  arg1 = *(Model **)&jarg1; 
-  result = (char *)(arg1)->getName();
-  if (result) jresult = jenv->NewStringUTF((const char *)result);
-  return jresult;
-}
-
-
 SWIGEXPORT jdouble JNICALL Java_org_simgrid_surf_SurfJNI_Model_1shareResources(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2) {
   jdouble jresult = 0 ;
   Model *arg1 = (Model *) 0 ;
@@ -2982,23 +2966,14 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_delete_1Model(JNIEnv *jenv
 }
 
 
-SWIGEXPORT jlong JNICALL Java_org_simgrid_surf_SurfJNI_new_1CpuModel(JNIEnv *jenv, jclass jcls, jstring jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_simgrid_surf_SurfJNI_new_1CpuModel(JNIEnv *jenv, jclass jcls) {
   jlong jresult = 0 ;
-  char *arg1 = (char *) 0 ;
   CpuModel *result = 0 ;
   
   (void)jenv;
   (void)jcls;
-  arg1 = 0;
-  if (jarg1) {
-    arg1 = (char *)jenv->GetStringUTFChars(jarg1, 0);
-    if (!arg1) return 0;
-  }
-  result = (CpuModel *)new SwigDirector_CpuModel(jenv,(char const *)arg1);
+  result = (CpuModel *)new SwigDirector_CpuModel(jenv);
   *(CpuModel **)&jresult = result; 
-  {
-    
-  }
   return jresult;
 }