X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c8820859cfc00e1cbf4ba9cbfafadcb827b6197..f3e4803befab19389587dd1d9af5ecdeffec551e:/src/bindings/java/org/simgrid/surf/SurfJNI.java?ds=sidebyside

diff --git a/src/bindings/java/org/simgrid/surf/SurfJNI.java b/src/bindings/java/org/simgrid/surf/SurfJNI.java
index 040ca882d3..aad944caa0 100644
--- a/src/bindings/java/org/simgrid/surf/SurfJNI.java
+++ b/src/bindings/java/org/simgrid/surf/SurfJNI.java
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * Do not make changes to this file unless you know what you are doing--modify
  * the SWIG interface file instead.
@@ -13,6 +13,7 @@ import org.simgrid.NativeLib;
 public class SurfJNI {
 
   static {
+    NativeLib.nativeInit("simgrid");
     NativeLib.nativeInit("surf-java");
     Runtime.getRuntime().addShutdownHook(
       new Thread() {
@@ -50,15 +51,15 @@ public class SurfJNI {
   public final static native void Plugin_activateCpuActionStateChangedCallback(long jarg1, Plugin jarg1_);
   public final static native void Plugin_cpuActionStateChangedCallback(long jarg1, Plugin jarg1_, long jarg2, CpuAction jarg2_, int jarg3, int jarg4);
   public final static native void Plugin_cpuActionStateChangedCallbackSwigExplicitPlugin(long jarg1, Plugin jarg1_, long jarg2, CpuAction jarg2_, int jarg3, int jarg4);
-  public final static native void Plugin_activateNetworkLinkCreatedCallback(long jarg1, Plugin jarg1_);
-  public final static native void Plugin_networkLinkCreatedCallback(long jarg1, Plugin jarg1_, long jarg2, NetworkLink jarg2_);
-  public final static native void Plugin_networkLinkCreatedCallbackSwigExplicitPlugin(long jarg1, Plugin jarg1_, long jarg2, NetworkLink jarg2_);
-  public final static native void Plugin_activateNetworkLinkDestructedCallback(long jarg1, Plugin jarg1_);
-  public final static native void Plugin_networkLinkDestructedCallback(long jarg1, Plugin jarg1_, long jarg2, NetworkLink jarg2_);
-  public final static native void Plugin_networkLinkDestructedCallbackSwigExplicitPlugin(long jarg1, Plugin jarg1_, long jarg2, NetworkLink jarg2_);
-  public final static native void Plugin_activateNetworkLinkStateChangedCallback(long jarg1, Plugin jarg1_);
-  public final static native void Plugin_networkLinkStateChangedCallback(long jarg1, Plugin jarg1_, long jarg2, NetworkLink jarg2_, int jarg3, int jarg4);
-  public final static native void Plugin_networkLinkStateChangedCallbackSwigExplicitPlugin(long jarg1, Plugin jarg1_, long jarg2, NetworkLink jarg2_, int jarg3, int jarg4);
+  public final static native void Plugin_activateLinkCreatedCallback(long jarg1, Plugin jarg1_);
+  public final static native void Plugin_networkLinkCreatedCallback(long jarg1, Plugin jarg1_, long jarg2, Link jarg2_);
+  public final static native void Plugin_networkLinkCreatedCallbackSwigExplicitPlugin(long jarg1, Plugin jarg1_, long jarg2, Link jarg2_);
+  public final static native void Plugin_activateLinkDestructedCallback(long jarg1, Plugin jarg1_);
+  public final static native void Plugin_networkLinkDestructedCallback(long jarg1, Plugin jarg1_, long jarg2, Link jarg2_);
+  public final static native void Plugin_networkLinkDestructedCallbackSwigExplicitPlugin(long jarg1, Plugin jarg1_, long jarg2, Link jarg2_);
+  public final static native void Plugin_activateLinkStateChangedCallback(long jarg1, Plugin jarg1_);
+  public final static native void Plugin_networkLinkStateChangedCallback(long jarg1, Plugin jarg1_, long jarg2, Link jarg2_, int jarg3, int jarg4);
+  public final static native void Plugin_networkLinkStateChangedCallbackSwigExplicitPlugin(long jarg1, Plugin jarg1_, long jarg2, Link jarg2_, int jarg3, int jarg4);
   public final static native void Plugin_activateNetworkActionStateChangedCallback(long jarg1, Plugin jarg1_);
   public final static native void Plugin_networkActionStateChangedCallback(long jarg1, Plugin jarg1_, long jarg2, NetworkAction jarg2_, int jarg3, int jarg4);
   public final static native void Plugin_networkActionStateChangedCallbackSwigExplicitPlugin(long jarg1, Plugin jarg1_, long jarg2, NetworkAction jarg2_, int jarg3, int jarg4);
@@ -71,8 +72,6 @@ public class SurfJNI {
   public final static native void delete_TmgrTrace(long jarg1);
   public final static native long TmgrTraceEvent_getIdx(long jarg1, TmgrTraceEvent jarg1_);
   public final static native void delete_TmgrTraceEvent(long jarg1);
-  public final static native long new_Model(String jarg1);
-  public final static native String Model_getName(long jarg1, Model jarg1_);
   public final static native double Model_shareResources(long jarg1, Model jarg1_, double jarg2);
   public final static native double Model_shareResourcesLazy(long jarg1, Model jarg1_, double jarg2);
   public final static native double Model_shareResourcesFull(long jarg1, Model jarg1_, double jarg2);
@@ -80,11 +79,11 @@ public class SurfJNI {
   public final static native void Model_updateActionsStateLazy(long jarg1, Model jarg1_, double jarg2, double jarg3);
   public final static native void Model_updateActionsStateFull(long jarg1, Model jarg1_, double jarg2, double jarg3);
   public final static native long Model_getRunningActionSet(long jarg1, Model jarg1_);
+  public final static native void Model_addTraces(long jarg1, Model jarg1_);
   public final static native void delete_Model(long jarg1);
-  public final static native long new_CpuModel(String jarg1);
+  public final static native long new_CpuModel();
   public final static native void delete_CpuModel(long jarg1);
-  public final static native long CpuModel_createResource(long jarg1, CpuModel jarg1_, String jarg2, double[] jarg3, int jarg4, double jarg5, long jarg6, TmgrTrace jarg6_, int jarg7, int jarg8, long jarg9, TmgrTrace jarg9_, long jarg10, XbtDict jarg10_);
-  public final static native void CpuModel_addTraces(long jarg1, CpuModel jarg1_);
+  public final static native long CpuModel_createCpu(long jarg1, CpuModel jarg1_, String jarg2, double[] jarg3, int jarg4, double jarg5, long jarg6, TmgrTrace jarg6_, int jarg7, int jarg8, long jarg9, TmgrTrace jarg9_, long jarg10, XbtDict jarg10_);
   public final static native void CpuModel_director_connect(CpuModel obj, long cptr, boolean mem_own, boolean weak_global);
   public final static native void CpuModel_change_ownership(CpuModel obj, long cptr, boolean take_or_release);
   public final static native String Resource_getName(long jarg1, Resource jarg1_);
@@ -110,17 +109,18 @@ public class SurfJNI {
   public final static native double Cpu_getAvailableSpeedSwigExplicitCpu(long jarg1, Cpu jarg1_);
   public final static native double Cpu_getPowerPeakAt(long jarg1, Cpu jarg1_, int jarg2);
   public final static native int Cpu_getNbPstates(long jarg1, Cpu jarg1_);
-  public final static native void Cpu_setPowerPeakAt(long jarg1, Cpu jarg1_, int jarg2);
+  public final static native void Cpu_setPstate(long jarg1, Cpu jarg1_, int jarg2);
+  public final static native int Cpu_getPstate(long jarg1, Cpu jarg1_);
   public final static native void Cpu_setState(long jarg1, Cpu jarg1_, int jarg2);
   public final static native void Cpu_director_connect(Cpu obj, long cptr, boolean mem_own, boolean weak_global);
   public final static native void Cpu_change_ownership(Cpu obj, long cptr, boolean take_or_release);
-  public final static native void delete_NetworkLink(long jarg1);
-  public final static native double NetworkLink_getBandwidth(long jarg1, NetworkLink jarg1_);
-  public final static native void NetworkLink_updateBandwidth__SWIG_0(long jarg1, NetworkLink jarg1_, double jarg2, double jarg3);
-  public final static native void NetworkLink_updateBandwidth__SWIG_1(long jarg1, NetworkLink jarg1_, double jarg2);
-  public final static native double NetworkLink_getLatency(long jarg1, NetworkLink jarg1_);
-  public final static native void NetworkLink_updateLatency__SWIG_0(long jarg1, NetworkLink jarg1_, double jarg2, double jarg3);
-  public final static native void NetworkLink_updateLatency__SWIG_1(long jarg1, NetworkLink jarg1_, double jarg2);
+  public final static native void delete_Link(long jarg1);
+  public final static native double Link_getBandwidth(long jarg1, Link jarg1_);
+  public final static native void Link_updateBandwidth__SWIG_0(long jarg1, Link jarg1_, double jarg2, double jarg3);
+  public final static native void Link_updateBandwidth__SWIG_1(long jarg1, Link jarg1_, double jarg2);
+  public final static native double Link_getLatency(long jarg1, Link jarg1_);
+  public final static native void Link_updateLatency__SWIG_0(long jarg1, Link jarg1_, double jarg2, double jarg3);
+  public final static native void Link_updateLatency__SWIG_1(long jarg1, Link jarg1_, double jarg2);
   public final static native long new_Action(long jarg1, Model jarg1_, double jarg2, boolean jarg3);
   public final static native void delete_Action(long jarg1);
   public final static native long Action_getModel(long jarg1, Action jarg1_);
@@ -156,7 +156,7 @@ public class SurfJNI {
   public final static native int SURF_RESOURCE_OFF_get();
   public final static native long CpuModel_SWIGUpcast(long jarg1);
   public final static native long Cpu_SWIGUpcast(long jarg1);
-  public final static native long NetworkLink_SWIGUpcast(long jarg1);
+  public final static native long Link_SWIGUpcast(long jarg1);
   public final static native long CpuAction_SWIGUpcast(long jarg1);
   public final static native long NetworkAction_SWIGUpcast(long jarg1);
 
@@ -173,13 +173,13 @@ public class SurfJNI {
     self.cpuActionStateChangedCallback((action == 0) ? null : new CpuAction(action, false), ActionState.swigToEnum(arg1), ActionState.swigToEnum(arg2));
   }
   public static void SwigDirector_Plugin_networkLinkCreatedCallback(Plugin self, long link) {
-    self.networkLinkCreatedCallback((link == 0) ? null : new NetworkLink(link, false));
+    self.networkLinkCreatedCallback((link == 0) ? null : new Link(link, false));
   }
   public static void SwigDirector_Plugin_networkLinkDestructedCallback(Plugin self, long link) {
-    self.networkLinkDestructedCallback((link == 0) ? null : new NetworkLink(link, false));
+    self.networkLinkDestructedCallback((link == 0) ? null : new Link(link, false));
   }
   public static void SwigDirector_Plugin_networkLinkStateChangedCallback(Plugin self, long link, int arg1, int arg2) {
-    self.networkLinkStateChangedCallback((link == 0) ? null : new NetworkLink(link, false), ResourceState.swigToEnum(arg1), ResourceState.swigToEnum(arg2));
+    self.networkLinkStateChangedCallback((link == 0) ? null : new Link(link, false), ResourceState.swigToEnum(arg1), ResourceState.swigToEnum(arg2));
   }
   public static void SwigDirector_Plugin_networkActionStateChangedCallback(Plugin self, long action, int old, int cur) {
     self.networkActionStateChangedCallback((action == 0) ? null : new NetworkAction(action, false), ActionState.swigToEnum(old), ActionState.swigToEnum(cur));
@@ -208,12 +208,12 @@ public class SurfJNI {
   public static long SwigDirector_CpuModel_getRunningActionSet(CpuModel self) {
     return ActionList.getCPtr(self.getRunningActionSet());
   }
-  public static long SwigDirector_CpuModel_createResource(CpuModel self, String name, double[] power_peak, int pstate, double power_scale, long power_trace, int core, int state_initial, long state_trace, long cpu_properties) {
-    return Cpu.getCPtr(self.createResource(name, power_peak, pstate, power_scale, (power_trace == 0) ? null : new TmgrTrace(power_trace, false), core, ResourceState.swigToEnum(state_initial), (state_trace == 0) ? null : new TmgrTrace(state_trace, false), (cpu_properties == 0) ? null : new XbtDict(cpu_properties, false)));
-  }
   public static void SwigDirector_CpuModel_addTraces(CpuModel self) {
     self.addTraces();
   }
+  public static long SwigDirector_CpuModel_createCpu(CpuModel self, String name, double[] power_peak, int pstate, double power_scale, long power_trace, int core, int state_initial, long state_trace, long cpu_properties) {
+    return Cpu.getCPtr(self.createCpu(name, power_peak, pstate, power_scale, (power_trace == 0) ? null : new TmgrTrace(power_trace, false), core, ResourceState.swigToEnum(state_initial), (state_trace == 0) ? null : new TmgrTrace(state_trace, false), (cpu_properties == 0) ? null : new XbtDict(cpu_properties, false)));
+  }
   public static boolean SwigDirector_Cpu_isUsed(Cpu self) {
     return self.isUsed();
   }
@@ -247,8 +247,11 @@ public class SurfJNI {
   public static int SwigDirector_Cpu_getNbPstates(Cpu self) {
     return self.getNbPstates();
   }
-  public static void SwigDirector_Cpu_setPowerPeakAt(Cpu self, int pstate_index) {
-    self.setPowerPeakAt(pstate_index);
+  public static void SwigDirector_Cpu_setPstate(Cpu self, int pstate_index) {
+    self.setPstate(pstate_index);
+  }
+  public static int SwigDirector_Cpu_getPstate(Cpu self) {
+    return self.getPstate();
   }
   public static double SwigDirector_CpuAction_getRemains(CpuAction self) {
     return self.getRemains();