Yup, that's an useless cosmetics.
+ surf.java:
+ * class NetworkLink renamed to Link
+
SimGrid (3.12) NOT RELEASED; urgency=low
cMSG:
src/bindings/java/org/simgrid/surf/LmmVariable.java
src/bindings/java/org/simgrid/surf/Model.java
src/bindings/java/org/simgrid/surf/NetworkAction.java
- src/bindings/java/org/simgrid/surf/NetworkLink.java
+ src/bindings/java/org/simgrid/surf/Link.java
src/bindings/java/org/simgrid/surf/Plugin.java
src/bindings/java/org/simgrid/surf/Resource.java
src/bindings/java/org/simgrid/surf/ResourceState.java
}
public void updateBandwidthRoute(String src, String dst, double bandwidth){
- NetworkLink[] route = Surf.getRoute(src, dst);
+ Link[] route = Surf.getRoute(src, dst);
for (int i =0; i<route.length; i++){
Msg.info("Trace: bandwidth of "+route[i].getName()+" before "+route[i].getBandwidth());
route[i].updateBandwidth(bandwidth);//getName();
}
}
+ @Override
public void networkCommunicateCallback(NetworkAction action, RoutingEdge src, RoutingEdge dst, double size, double rate){
if (src.getName().equals(this.src) && dst.getName().equals(this.dst)) {
action.setBound(this.bandwidth);
}
Msg.info("Trace: Communicate message of size "+size+" with rate "+rate+" and bound "+action.getBound()+" from "+src.getName()+" to "+dst.getName());
}
-
}
activateCpuStateChangedCallback();
activateCpuActionStateChangedCallback();
- activateNetworkLinkCreatedCallback();
- activateNetworkLinkDestructedCallback();
- activateNetworkLinkStateChangedCallback();
+ activateLinkCreatedCallback();
+ activateLinkDestructedCallback();
+ activateLinkStateChangedCallback();
activateNetworkActionStateChangedCallback();
}
+ @Override
public void cpuCreatedCallback(Cpu cpu) {
Msg.info("Trace: Cpu created "+cpu.getName());
}
+ @Override
public void cpuDestructedCallback(Cpu cpu) {
Msg.info("Trace: Cpu destructed "+cpu.getName());
}
+ @Override
public void cpuStateChangedCallback(Cpu cpu, ResourceState old, ResourceState cur){
Msg.info("Trace: Cpu state changed "+cpu.getName());
}
+ @Override
public void cpuActionStateChangedCallback(CpuAction action, ActionState old, ActionState cur){
Msg.info("Trace: CpuAction state changed "+action.getModel().getName());
}
- public void networkLinkCreatedCallback(NetworkLink link) {
- Msg.info("Trace: NetworkLink created "+link.getName());
+ @Override
+ public void networkLinkCreatedCallback(Link link) {
+ Msg.info("Trace: Link created "+link.getName());
}
- public void networkLinkDestructedCallback(NetworkLink link) {
- Msg.info("Trace: NetworkLink destructed "+link.getName());
+ @Override
+ public void networkLinkDestructedCallback(Link link) {
+ Msg.info("Trace: Link destructed "+link.getName());
}
- public void networkLinkStateChangedCallback(NetworkLink link, ResourceState old, ResourceState cur){
- Msg.info("Trace: NetworkLink state changed "+link.getName());
+ @Override
+ public void networkLinkStateChangedCallback(Link link, ResourceState old, ResourceState cur){
+ Msg.info("Trace: Link state changed "+link.getName());
}
+ @Override
public void networkActionStateChangedCallback(NetworkAction action, ActionState old, ActionState cur){
Msg.info("Trace: NetworkAction state changed "+action.getModel().getName());
}
$ java -classpath ${classpath:=.} surfPlugin/TestPlugin ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/surfPlugin/surfPluginDeployment.xml
> [0.000000] [jmsg/INFO] Using regular java threads. Coroutines could speed your simulation up.
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created __loopback__
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed __loopback__
+> [0.000000] [jmsg/INFO] Trace: Link created __loopback__
+> [0.000000] [jmsg/INFO] Trace: Link state changed __loopback__
> [0.000000] [jmsg/INFO] Trace: Cpu created Tremblay
> [0.000000] [jmsg/INFO] Trace: Cpu state changed Tremblay
> [0.000000] [jmsg/INFO] Trace: Cpu created Jupiter
> [0.000000] [jmsg/INFO] Trace: Cpu state changed Ginette
> [0.000000] [jmsg/INFO] Trace: Cpu created Bourassa
> [0.000000] [jmsg/INFO] Trace: Cpu state changed Bourassa
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 6
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 6
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 3
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 3
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 7
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 7
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 9
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 9
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 2
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 2
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 8
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 8
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 1
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 1
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 4
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 4
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 0
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 0
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created 5
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed 5
-> [0.000000] [jmsg/INFO] Trace: NetworkLink created loopback
-> [0.000000] [jmsg/INFO] Trace: NetworkLink state changed loopback
+> [0.000000] [jmsg/INFO] Trace: Link created 6
+> [0.000000] [jmsg/INFO] Trace: Link state changed 6
+> [0.000000] [jmsg/INFO] Trace: Link created 3
+> [0.000000] [jmsg/INFO] Trace: Link state changed 3
+> [0.000000] [jmsg/INFO] Trace: Link created 7
+> [0.000000] [jmsg/INFO] Trace: Link state changed 7
+> [0.000000] [jmsg/INFO] Trace: Link created 9
+> [0.000000] [jmsg/INFO] Trace: Link state changed 9
+> [0.000000] [jmsg/INFO] Trace: Link created 2
+> [0.000000] [jmsg/INFO] Trace: Link state changed 2
+> [0.000000] [jmsg/INFO] Trace: Link created 8
+> [0.000000] [jmsg/INFO] Trace: Link state changed 8
+> [0.000000] [jmsg/INFO] Trace: Link created 1
+> [0.000000] [jmsg/INFO] Trace: Link state changed 1
+> [0.000000] [jmsg/INFO] Trace: Link created 4
+> [0.000000] [jmsg/INFO] Trace: Link state changed 4
+> [0.000000] [jmsg/INFO] Trace: Link created 0
+> [0.000000] [jmsg/INFO] Trace: Link state changed 0
+> [0.000000] [jmsg/INFO] Trace: Link created 5
+> [0.000000] [jmsg/INFO] Trace: Link state changed 5
+> [0.000000] [jmsg/INFO] Trace: Link created loopback
+> [0.000000] [jmsg/INFO] Trace: Link state changed loopback
> [Tremblay:surfPlugin.Sender:(1) 0.000000] [jmsg/INFO] helloo!
> [Tremblay:surfPlugin.Sender:(1) 0.000000] [jmsg/INFO] host count: 1
> [Tremblay:surfPlugin.Sender:(1) 0.000000] [jmsg/INFO] sender time: 0.0
> [0.019146] [jmsg/INFO] Trace: Cpu destructed Bourassa
> [0.019146] [jmsg/INFO] Trace: Cpu destructed Jupiter
> [0.019146] [jmsg/INFO] Trace: Cpu destructed Ginette
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed __loopback__
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed loopback
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 0
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 1
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 2
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 3
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 4
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 5
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 6
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 7
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 8
-> [0.019146] [jmsg/INFO] Trace: NetworkLink destructed 9
+> [0.019146] [jmsg/INFO] Trace: Link destructed __loopback__
+> [0.019146] [jmsg/INFO] Trace: Link destructed loopback
+> [0.019146] [jmsg/INFO] Trace: Link destructed 0
+> [0.019146] [jmsg/INFO] Trace: Link destructed 1
+> [0.019146] [jmsg/INFO] Trace: Link destructed 2
+> [0.019146] [jmsg/INFO] Trace: Link destructed 3
+> [0.019146] [jmsg/INFO] Trace: Link destructed 4
+> [0.019146] [jmsg/INFO] Trace: Link destructed 5
+> [0.019146] [jmsg/INFO] Trace: Link destructed 6
+> [0.019146] [jmsg/INFO] Trace: Link destructed 7
+> [0.019146] [jmsg/INFO] Trace: Link destructed 8
+> [0.019146] [jmsg/INFO] Trace: Link destructed 9
/**
* A generic resource for the network component
*/
-public class NetworkLink extends Resource {
+public class Link extends Resource {
private long swigCPtr;
- protected NetworkLink(long cPtr, boolean cMemoryOwn) {
- super(SurfJNI.NetworkLink_SWIGUpcast(cPtr), cMemoryOwn);
+ protected Link(long cPtr, boolean cMemoryOwn) {
+ super(SurfJNI.Link_SWIGUpcast(cPtr), cMemoryOwn);
swigCPtr = cPtr;
}
- protected static long getCPtr(NetworkLink obj) {
+ protected static long getCPtr(Link obj) {
return (obj == null) ? 0 : obj.swigCPtr;
}
if (swigCPtr != 0) {
if (swigCMemOwn) {
swigCMemOwn = false;
- SurfJNI.delete_NetworkLink(swigCPtr);
+ SurfJNI.delete_Link(swigCPtr);
}
swigCPtr = 0;
}
super.delete();
}
- protected static long[] cArrayUnwrap(NetworkLink[] arrayWrapper) {
+ protected static long[] cArrayUnwrap(Link[] arrayWrapper) {
long[] cArray = new long[arrayWrapper.length];
for (int i=0; i<arrayWrapper.length; i++)
- cArray[i] = NetworkLink.getCPtr(arrayWrapper[i]);
+ cArray[i] = Link.getCPtr(arrayWrapper[i]);
return cArray;
}
- protected static NetworkLink[] cArrayWrap(long[] cArray, boolean cMemoryOwn) {
- NetworkLink[] arrayWrapper = new NetworkLink[cArray.length];
+ protected static Link[] cArrayWrap(long[] cArray, boolean cMemoryOwn) {
+ Link[] arrayWrapper = new Link[cArray.length];
for (int i=0; i<cArray.length; i++)
- arrayWrapper[i] = new NetworkLink(cArray[i], cMemoryOwn);
+ arrayWrapper[i] = new Link(cArray[i], cMemoryOwn);
return arrayWrapper;
}
* @return The bandwidth of the link
*/
public double getBandwidth() {
- return SurfJNI.NetworkLink_getBandwidth(swigCPtr, this);
+ return SurfJNI.Link_getBandwidth(swigCPtr, this);
}
* @param value The new bandwidth
*/
public void updateBandwidth(double value, double date) {
- SurfJNI.NetworkLink_updateBandwidth__SWIG_0(swigCPtr, this, value, date);
+ SurfJNI.Link_updateBandwidth__SWIG_0(swigCPtr, this, value, date);
}
* @param value The new bandwidth
*/
public void updateBandwidth(double value) {
- SurfJNI.NetworkLink_updateBandwidth__SWIG_1(swigCPtr, this, value);
+ SurfJNI.Link_updateBandwidth__SWIG_1(swigCPtr, this, value);
}
* @return The latency of the link
*/
public double getLatency() {
- return SurfJNI.NetworkLink_getLatency(swigCPtr, this);
+ return SurfJNI.Link_getLatency(swigCPtr, this);
}
* @param value The new latency
*/
public void updateLatency(double value, double date) {
- SurfJNI.NetworkLink_updateLatency__SWIG_0(swigCPtr, this, value, date);
+ SurfJNI.Link_updateLatency__SWIG_0(swigCPtr, this, value, date);
}
* @param value The new latency
*/
public void updateLatency(double value) {
- SurfJNI.NetworkLink_updateLatency__SWIG_1(swigCPtr, this, value);
+ SurfJNI.Link_updateLatency__SWIG_1(swigCPtr, this, value);
}
}
/**
* An network action created by network model
- * @see NetworkLink
+ * @see Link
*/
public class NetworkAction extends Action {
private long swigCPtr;
if (getClass() == Plugin.class) SurfJNI.Plugin_cpuActionStateChangedCallback(swigCPtr, this, CpuAction.getCPtr(action), action, arg1.swigValue(), arg2.swigValue()); else SurfJNI.Plugin_cpuActionStateChangedCallbackSwigExplicitPlugin(swigCPtr, this, CpuAction.getCPtr(action), action, arg1.swigValue(), arg2.swigValue());
}
- public void activateNetworkLinkCreatedCallback() {
- SurfJNI.Plugin_activateNetworkLinkCreatedCallback(swigCPtr, this);
+ public void activateLinkCreatedCallback() {
+ SurfJNI.Plugin_activateLinkCreatedCallback(swigCPtr, this);
}
- public void networkLinkCreatedCallback(NetworkLink link) {
- if (getClass() == Plugin.class) SurfJNI.Plugin_networkLinkCreatedCallback(swigCPtr, this, NetworkLink.getCPtr(link), link); else SurfJNI.Plugin_networkLinkCreatedCallbackSwigExplicitPlugin(swigCPtr, this, NetworkLink.getCPtr(link), link);
+ public void networkLinkCreatedCallback(Link link) {
+ if (getClass() == Plugin.class) SurfJNI.Plugin_networkLinkCreatedCallback(swigCPtr, this, Link.getCPtr(link), link); else SurfJNI.Plugin_networkLinkCreatedCallbackSwigExplicitPlugin(swigCPtr, this, Link.getCPtr(link), link);
}
- public void activateNetworkLinkDestructedCallback() {
- SurfJNI.Plugin_activateNetworkLinkDestructedCallback(swigCPtr, this);
+ public void activateLinkDestructedCallback() {
+ SurfJNI.Plugin_activateLinkDestructedCallback(swigCPtr, this);
}
- public void networkLinkDestructedCallback(NetworkLink link) {
- if (getClass() == Plugin.class) SurfJNI.Plugin_networkLinkDestructedCallback(swigCPtr, this, NetworkLink.getCPtr(link), link); else SurfJNI.Plugin_networkLinkDestructedCallbackSwigExplicitPlugin(swigCPtr, this, NetworkLink.getCPtr(link), link);
+ public void networkLinkDestructedCallback(Link link) {
+ if (getClass() == Plugin.class) SurfJNI.Plugin_networkLinkDestructedCallback(swigCPtr, this, Link.getCPtr(link), link); else SurfJNI.Plugin_networkLinkDestructedCallbackSwigExplicitPlugin(swigCPtr, this, Link.getCPtr(link), link);
}
- public void activateNetworkLinkStateChangedCallback() {
- SurfJNI.Plugin_activateNetworkLinkStateChangedCallback(swigCPtr, this);
+ public void activateLinkStateChangedCallback() {
+ SurfJNI.Plugin_activateLinkStateChangedCallback(swigCPtr, this);
}
- public void networkLinkStateChangedCallback(NetworkLink link, ResourceState arg1, ResourceState arg2) {
- if (getClass() == Plugin.class) SurfJNI.Plugin_networkLinkStateChangedCallback(swigCPtr, this, NetworkLink.getCPtr(link), link, arg1.swigValue(), arg2.swigValue()); else SurfJNI.Plugin_networkLinkStateChangedCallbackSwigExplicitPlugin(swigCPtr, this, NetworkLink.getCPtr(link), link, arg1.swigValue(), arg2.swigValue());
+ public void networkLinkStateChangedCallback(Link link, ResourceState arg1, ResourceState arg2) {
+ if (getClass() == Plugin.class) SurfJNI.Plugin_networkLinkStateChangedCallback(swigCPtr, this, Link.getCPtr(link), link, arg1.swigValue(), arg2.swigValue()); else SurfJNI.Plugin_networkLinkStateChangedCallbackSwigExplicitPlugin(swigCPtr, this, Link.getCPtr(link), link, arg1.swigValue(), arg2.swigValue());
}
public void activateNetworkActionStateChangedCallback() {
SurfJNI.setCpu(name, Cpu.getCPtr(cpu), cpu);
}
- public static NetworkLink[] getRoute(String srcName, String dstName) {
- return NetworkLink.cArrayWrap(SurfJNI.getRoute(srcName, dstName), false);
+ public static Link[] getRoute(String srcName, String dstName) {
+ return Link.cArrayWrap(SurfJNI.getRoute(srcName, dstName), false);
}
}
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);
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_);
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);
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));
if (swigjobj) jenv->DeleteLocalRef(swigjobj);
}
-void SwigDirector_Plugin::networkLinkCreatedCallback(NetworkLink *link) {
+void SwigDirector_Plugin::networkLinkCreatedCallback(Link *link) {
JNIEnvWrapper swigjnienv(this) ;
JNIEnv * jenv = swigjnienv.getJNIEnv() ;
jobject swigjobj = (jobject) NULL ;
}
swigjobj = swig_get_self(jenv);
if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
- *((NetworkLink **)&jlink) = (NetworkLink *) link;
+ *((Link **)&jlink) = (Link *) link;
jenv->CallStaticVoidMethod(Swig::jclass_SurfJNI, Swig::director_methids[4], swigjobj, jlink);
if (jenv->ExceptionCheck() == JNI_TRUE) return ;
} else {
if (swigjobj) jenv->DeleteLocalRef(swigjobj);
}
-void SwigDirector_Plugin::networkLinkDestructedCallback(NetworkLink *link) {
+void SwigDirector_Plugin::networkLinkDestructedCallback(Link *link) {
JNIEnvWrapper swigjnienv(this) ;
JNIEnv * jenv = swigjnienv.getJNIEnv() ;
jobject swigjobj = (jobject) NULL ;
}
swigjobj = swig_get_self(jenv);
if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
- *((NetworkLink **)&jlink) = (NetworkLink *) link;
+ *((Link **)&jlink) = (Link *) link;
jenv->CallStaticVoidMethod(Swig::jclass_SurfJNI, Swig::director_methids[5], swigjobj, jlink);
if (jenv->ExceptionCheck() == JNI_TRUE) return ;
} else {
if (swigjobj) jenv->DeleteLocalRef(swigjobj);
}
-void SwigDirector_Plugin::networkLinkStateChangedCallback(NetworkLink *link, e_surf_resource_state_t arg1, e_surf_resource_state_t arg2) {
+void SwigDirector_Plugin::networkLinkStateChangedCallback(Link *link, e_surf_resource_state_t arg1, e_surf_resource_state_t arg2) {
JNIEnvWrapper swigjnienv(this) ;
JNIEnv * jenv = swigjnienv.getJNIEnv() ;
jobject swigjobj = (jobject) NULL ;
}
swigjobj = swig_get_self(jenv);
if (swigjobj && jenv->IsSameObject(swigjobj, NULL) == JNI_FALSE) {
- *((NetworkLink **)&jlink) = (NetworkLink *) link;
+ *((Link **)&jlink) = (Link *) link;
jarg1 = (jint) arg1;
jarg2 = (jint) arg2;
jenv->CallStaticVoidMethod(Swig::jclass_SurfJNI, Swig::director_methids[6], swigjobj, jlink, jarg1, jarg2);
"cpuActionStateChangedCallback", "(Lorg/simgrid/surf/CpuAction;Lorg/simgrid/surf/ActionState;Lorg/simgrid/surf/ActionState;)V", NULL
},
{
- "networkLinkCreatedCallback", "(Lorg/simgrid/surf/NetworkLink;)V", NULL
+ "networkLinkCreatedCallback", "(Lorg/simgrid/surf/Link;)V", NULL
},
{
- "networkLinkDestructedCallback", "(Lorg/simgrid/surf/NetworkLink;)V", NULL
+ "networkLinkDestructedCallback", "(Lorg/simgrid/surf/Link;)V", NULL
},
{
- "networkLinkStateChangedCallback", "(Lorg/simgrid/surf/NetworkLink;Lorg/simgrid/surf/ResourceState;Lorg/simgrid/surf/ResourceState;)V", NULL
+ "networkLinkStateChangedCallback", "(Lorg/simgrid/surf/Link;Lorg/simgrid/surf/ResourceState;Lorg/simgrid/surf/ResourceState;)V", NULL
},
{
"networkActionStateChangedCallback", "(Lorg/simgrid/surf/NetworkAction;Lorg/simgrid/surf/ActionState;Lorg/simgrid/surf/ActionState;)V", NULL
jlongArray jresult = 0 ;
char *arg1 = (char *) 0 ;
char *arg2 = (char *) 0 ;
- NetworkLinkDynar result;
+ LinkDynar result;
(void)jenv;
(void)jcls;
long l = xbt_dynar_length(result);
jresult = jenv->NewLongArray(l);
unsigned i;
- NetworkLink *link;
+ Link *link;
jlong *elts = jenv->GetLongArrayElements(jresult, NULL);
xbt_dynar_foreach(result, i, link) {
elts[i] = (jlong)link;
}
-SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1activateNetworkLinkCreatedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1activateLinkCreatedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
Plugin *arg1 = (Plugin *) 0 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
arg1 = *(Plugin **)&jarg1;
- (arg1)->activateNetworkLinkCreatedCallback();
+ (arg1)->activateLinkCreatedCallback();
}
SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkCreatedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
Plugin *arg1 = (Plugin *) 0 ;
- NetworkLink *arg2 = (NetworkLink *) 0 ;
+ Link *arg2 = (Link *) 0 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
(void)jarg2_;
arg1 = *(Plugin **)&jarg1;
- arg2 = *(NetworkLink **)&jarg2;
+ arg2 = *(Link **)&jarg2;
(arg1)->networkLinkCreatedCallback(arg2);
}
SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkCreatedCallbackSwigExplicitPlugin(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
Plugin *arg1 = (Plugin *) 0 ;
- NetworkLink *arg2 = (NetworkLink *) 0 ;
+ Link *arg2 = (Link *) 0 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
(void)jarg2_;
arg1 = *(Plugin **)&jarg1;
- arg2 = *(NetworkLink **)&jarg2;
+ arg2 = *(Link **)&jarg2;
(arg1)->Plugin::networkLinkCreatedCallback(arg2);
}
-SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1activateNetworkLinkDestructedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1activateLinkDestructedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
Plugin *arg1 = (Plugin *) 0 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
arg1 = *(Plugin **)&jarg1;
- (arg1)->activateNetworkLinkDestructedCallback();
+ (arg1)->activateLinkDestructedCallback();
}
SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkDestructedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
Plugin *arg1 = (Plugin *) 0 ;
- NetworkLink *arg2 = (NetworkLink *) 0 ;
+ Link *arg2 = (Link *) 0 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
(void)jarg2_;
arg1 = *(Plugin **)&jarg1;
- arg2 = *(NetworkLink **)&jarg2;
+ arg2 = *(Link **)&jarg2;
(arg1)->networkLinkDestructedCallback(arg2);
}
SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkDestructedCallbackSwigExplicitPlugin(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
Plugin *arg1 = (Plugin *) 0 ;
- NetworkLink *arg2 = (NetworkLink *) 0 ;
+ Link *arg2 = (Link *) 0 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
(void)jarg2_;
arg1 = *(Plugin **)&jarg1;
- arg2 = *(NetworkLink **)&jarg2;
+ arg2 = *(Link **)&jarg2;
(arg1)->Plugin::networkLinkDestructedCallback(arg2);
}
-SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1activateNetworkLinkStateChangedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1activateLinkStateChangedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
Plugin *arg1 = (Plugin *) 0 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
arg1 = *(Plugin **)&jarg1;
- (arg1)->activateNetworkLinkStateChangedCallback();
+ (arg1)->activateLinkStateChangedCallback();
}
SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkStateChangedCallback(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jint jarg3, jint jarg4) {
Plugin *arg1 = (Plugin *) 0 ;
- NetworkLink *arg2 = (NetworkLink *) 0 ;
+ Link *arg2 = (Link *) 0 ;
e_surf_resource_state_t arg3 ;
e_surf_resource_state_t arg4 ;
(void)jarg1_;
(void)jarg2_;
arg1 = *(Plugin **)&jarg1;
- arg2 = *(NetworkLink **)&jarg2;
+ arg2 = *(Link **)&jarg2;
arg3 = (e_surf_resource_state_t)jarg3;
arg4 = (e_surf_resource_state_t)jarg4;
(arg1)->networkLinkStateChangedCallback(arg2,arg3,arg4);
SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkStateChangedCallbackSwigExplicitPlugin(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jint jarg3, jint jarg4) {
Plugin *arg1 = (Plugin *) 0 ;
- NetworkLink *arg2 = (NetworkLink *) 0 ;
+ Link *arg2 = (Link *) 0 ;
e_surf_resource_state_t arg3 ;
e_surf_resource_state_t arg4 ;
(void)jarg1_;
(void)jarg2_;
arg1 = *(Plugin **)&jarg1;
- arg2 = *(NetworkLink **)&jarg2;
+ arg2 = *(Link **)&jarg2;
arg3 = (e_surf_resource_state_t)jarg3;
arg4 = (e_surf_resource_state_t)jarg4;
(arg1)->Plugin::networkLinkStateChangedCallback(arg2,arg3,arg4);
}
-SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_delete_1NetworkLink(JNIEnv *jenv, jclass jcls, jlong jarg1) {
- NetworkLink *arg1 = (NetworkLink *) 0 ;
+SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_delete_1Link(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+ Link *arg1 = (Link *) 0 ;
(void)jenv;
(void)jcls;
- arg1 = *(NetworkLink **)&jarg1;
+ arg1 = *(Link **)&jarg1;
delete arg1;
}
-SWIGEXPORT jdouble JNICALL Java_org_simgrid_surf_SurfJNI_NetworkLink_1getBandwidth(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+SWIGEXPORT jdouble JNICALL Java_org_simgrid_surf_SurfJNI_Link_1getBandwidth(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
jdouble jresult = 0 ;
- NetworkLink *arg1 = (NetworkLink *) 0 ;
+ Link *arg1 = (Link *) 0 ;
double result;
(void)jenv;
(void)jcls;
(void)jarg1_;
- arg1 = *(NetworkLink **)&jarg1;
+ arg1 = *(Link **)&jarg1;
result = (double)(arg1)->getBandwidth();
jresult = (jdouble)result;
return jresult;
}
-SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_NetworkLink_1updateBandwidth_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2, jdouble jarg3) {
- NetworkLink *arg1 = (NetworkLink *) 0 ;
+SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Link_1updateBandwidth_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2, jdouble jarg3) {
+ Link *arg1 = (Link *) 0 ;
double arg2 ;
double arg3 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
- arg1 = *(NetworkLink **)&jarg1;
+ arg1 = *(Link **)&jarg1;
arg2 = (double)jarg2;
arg3 = (double)jarg3;
(arg1)->updateBandwidth(arg2,arg3);
}
-SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_NetworkLink_1updateBandwidth_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2) {
- NetworkLink *arg1 = (NetworkLink *) 0 ;
+SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Link_1updateBandwidth_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2) {
+ Link *arg1 = (Link *) 0 ;
double arg2 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
- arg1 = *(NetworkLink **)&jarg1;
+ arg1 = *(Link **)&jarg1;
arg2 = (double)jarg2;
(arg1)->updateBandwidth(arg2);
}
-SWIGEXPORT jdouble JNICALL Java_org_simgrid_surf_SurfJNI_NetworkLink_1getLatency(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+SWIGEXPORT jdouble JNICALL Java_org_simgrid_surf_SurfJNI_Link_1getLatency(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
jdouble jresult = 0 ;
- NetworkLink *arg1 = (NetworkLink *) 0 ;
+ Link *arg1 = (Link *) 0 ;
double result;
(void)jenv;
(void)jcls;
(void)jarg1_;
- arg1 = *(NetworkLink **)&jarg1;
+ arg1 = *(Link **)&jarg1;
result = (double)(arg1)->getLatency();
jresult = (jdouble)result;
return jresult;
}
-SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_NetworkLink_1updateLatency_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2, jdouble jarg3) {
- NetworkLink *arg1 = (NetworkLink *) 0 ;
+SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Link_1updateLatency_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2, jdouble jarg3) {
+ Link *arg1 = (Link *) 0 ;
double arg2 ;
double arg3 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
- arg1 = *(NetworkLink **)&jarg1;
+ arg1 = *(Link **)&jarg1;
arg2 = (double)jarg2;
arg3 = (double)jarg3;
(arg1)->updateLatency(arg2,arg3);
}
-SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_NetworkLink_1updateLatency_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2) {
- NetworkLink *arg1 = (NetworkLink *) 0 ;
+SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Link_1updateLatency_1_1SWIG_11(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jdouble jarg2) {
+ Link *arg1 = (Link *) 0 ;
double arg2 ;
(void)jenv;
(void)jcls;
(void)jarg1_;
- arg1 = *(NetworkLink **)&jarg1;
+ arg1 = *(Link **)&jarg1;
arg2 = (double)jarg2;
(arg1)->updateLatency(arg2);
}
return baseptr;
}
-SWIGEXPORT jlong JNICALL Java_org_simgrid_surf_SurfJNI_NetworkLink_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+SWIGEXPORT jlong JNICALL Java_org_simgrid_surf_SurfJNI_Link_1SWIGUpcast(JNIEnv *jenv, jclass jcls, jlong jarg1) {
jlong baseptr = 0;
(void)jenv;
(void)jcls;
- *(Resource **)&baseptr = *(NetworkLink **)&jarg1;
+ *(Resource **)&baseptr = *(Link **)&jarg1;
return baseptr;
}
virtual void cpuDestructedCallback(Cpu *cpu);
virtual void cpuStateChangedCallback(Cpu *cpu, e_surf_resource_state_t arg1, e_surf_resource_state_t arg2);
virtual void cpuActionStateChangedCallback(CpuAction *action, e_surf_action_state_t arg1, e_surf_action_state_t arg2);
- virtual void networkLinkCreatedCallback(NetworkLink *link);
- virtual void networkLinkDestructedCallback(NetworkLink *link);
- virtual void networkLinkStateChangedCallback(NetworkLink *link, e_surf_resource_state_t arg1, e_surf_resource_state_t arg2);
+ virtual void networkLinkCreatedCallback(Link *link);
+ virtual void networkLinkDestructedCallback(Link *link);
+ virtual void networkLinkStateChangedCallback(Link *link, e_surf_resource_state_t arg1, e_surf_resource_state_t arg2);
virtual void networkActionStateChangedCallback(NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t cur);
virtual void networkCommunicateCallback(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst, double size, double rate);
public:
%typemap(freearg) char* name {
}
-/* Handle xbt_dynar_t of NetworkLink */
+/* Handle xbt_dynar_t of Link */
JAVA_ARRAYSOFCLASSES(Action);
%apply Action[] {ActionArrayPtr};
%typemap(jstype) ActionArrayPtr "Action[]"
}
};
-/* Handle xbt_dynar_t of NetworkLink */
-JAVA_ARRAYSOFCLASSES(NetworkLink);
-%apply NetworkLink[] {NetworkLinkDynar};
-%typemap(jstype) NetworkLinkDynar "NetworkLink[]"
-%typemap(javain) NetworkLinkDynar "NetworkLink.cArrayUnwrap($javainput)"
-%typemap(javaout) NetworkLinkDynar {
- return NetworkLink.cArrayWrap($jnicall, $owner);
+/* Handle xbt_dynar_t of Link */
+JAVA_ARRAYSOFCLASSES(Link);
+%apply Link[] {LinkDynar};
+%typemap(jstype) LinkDynar "Link[]"
+%typemap(javain) LinkDynar "Link.cArrayUnwrap($javainput)"
+%typemap(javaout) LinkDynar {
+ return Link.cArrayWrap($jnicall, $owner);
}
-%typemap(out) NetworkLinkDynar {
+%typemap(out) LinkDynar {
long l = xbt_dynar_length($1);
$result = jenv->NewLongArray(l);
unsigned i;
- NetworkLink *link;
+ Link *link;
jlong *elts = jenv->GetLongArrayElements($result, NULL);
xbt_dynar_foreach($1, i, link) {
elts[i] = (jlong)link;
void setState(e_surf_resource_state_t state);
};
-class NetworkLink : public Resource {
+class Link : public Resource {
public:
- NetworkLink();
- ~NetworkLink();
+ Link();
+ ~Link();
double getBandwidth();
void updateBandwidth(double value, double date=surf_get_clock());
double getLatency();
sg_host_surfcpu_set(sg_host_by_name(name), cpu);
}
-NetworkLinkDynar getRoute(char *srcName, char *dstName) {
+LinkDynar getRoute(char *srcName, char *dstName) {
RoutingEdge *src = sg_host_edge(sg_host_by_name(srcName));
RoutingEdge *dst = sg_host_edge(sg_host_by_name(dstName));
xbt_assert(src,"Cannot get the route from a NULL source");
}
-void Plugin::activateNetworkLinkCreatedCallback(){
+void Plugin::activateLinkCreatedCallback(){
surf_callback_connect(networkLinkCreatedCallbacks, boost::bind(&Plugin::networkLinkCreatedCallback, this, _1));
}
-void Plugin::activateNetworkLinkDestructedCallback(){
+void Plugin::activateLinkDestructedCallback(){
surf_callback_connect(networkLinkDestructedCallbacks, boost::bind(&Plugin::networkLinkDestructedCallback, this, _1));
}
-void Plugin::activateNetworkLinkStateChangedCallback(){
+void Plugin::activateLinkStateChangedCallback(){
surf_callback_connect(networkLinkStateChangedCallbacks, boost::bind(&Plugin::networkLinkStateChangedCallback, this, _1, _2, _3));
}
#include "src/surf/network_interface.hpp"
#include "src/surf/maxmin_private.hpp"
-typedef xbt_dynar_t NetworkLinkDynar;
+typedef xbt_dynar_t LinkDynar;
typedef ActionList *ActionArrayPtr;
double getClock();
void setCpu(char *name, Cpu *cpu);
-NetworkLinkDynar getRoute(char *srcName, char *dstName);
+LinkDynar getRoute(char *srcName, char *dstName);
class Plugin {
public:
virtual void cpuActionStateChangedCallback(CpuAction *action, e_surf_action_state_t, e_surf_action_state_t) {}
- void activateNetworkLinkCreatedCallback();
- virtual void networkLinkCreatedCallback(NetworkLink *link) {}
+ void activateLinkCreatedCallback();
+ virtual void networkLinkCreatedCallback(Link *link) {}
- void activateNetworkLinkDestructedCallback();
- virtual void networkLinkDestructedCallback(NetworkLink *link) {}
+ void activateLinkDestructedCallback();
+ virtual void networkLinkDestructedCallback(Link *link) {}
- void activateNetworkLinkStateChangedCallback();
- virtual void networkLinkStateChangedCallback(NetworkLink *link, e_surf_resource_state_t, e_surf_resource_state_t) {}
+ void activateLinkStateChangedCallback();
+ virtual void networkLinkStateChangedCallback(Link *link, e_surf_resource_state_t, e_surf_resource_state_t) {}
void activateNetworkActionStateChangedCallback();
virtual void networkActionStateChangedCallback(NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t cur) {}
public";
-%typemap(javaimports) NetworkLink "
+%typemap(javaimports) Link "
/**
* A generic resource for the network component
*/"
- %javamethodmodifiers NetworkLink::getBandwidth() "
+ %javamethodmodifiers Link::getBandwidth() "
/**
* @return The bandwidth of the link
*/
public";
-%javamethodmodifiers NetworkLink::updateBandwidth(double value, double date=surf_get_clock()) "
+%javamethodmodifiers Link::updateBandwidth(double value, double date=surf_get_clock()) "
/**
* @param value The new bandwidth
*/
public";
- %javamethodmodifiers NetworkLink::getLatency() "
+ %javamethodmodifiers Link::getLatency() "
/**
* @return The latency of the link
*/
public";
-%javamethodmodifiers NetworkLink::updateLatency(double value, double date=surf_get_clock()) "
+%javamethodmodifiers Link::updateLatency(double value, double date=surf_get_clock()) "
/**
* @param value The new latency
*/
%typemap(javaimports) NetworkAction "
/**
* An network action created by network model
- * @see NetworkLink
+ * @see Link
*/"
%javamethodmodifiers NetworkAction::getLatency() "
************/
/** @ingroup SURF_host_interface
* @brief SURF Host interface class
- * @details An host represents a machine with a aggregation of a Cpu, a NetworkLink and a Storage
+ * @details An host represents a machine with a aggregation of a Cpu, a Link and a Storage
*/
class Host : public Resource {
public:
xbt_dynar_t p_storage;
RoutingEdgePtr p_netElm;
CpuPtr p_cpu;
- NetworkLinkPtr p_network;
+ LinkPtr p_network;
/**
* @brief Get the list of virtual machines on the current Host
surf_host_model = NULL;
surf_network_model = new NetworkL07Model();
surf_cpu_model_pm = new CpuL07Model();
- routing_model_create(surf_network_model->createNetworkLink("__loopback__",
+ routing_model_create(surf_network_model->createLink("__loopback__",
498000000, NULL,
0.000015, NULL,
SURF_RESOURCE_ON, NULL,
return cpu;
}
-NetworkLinkPtr NetworkL07Model::createNetworkLink(const char *name,
+LinkPtr NetworkL07Model::createLink(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
e_surf_link_sharing_policy_t policy)
- : NetworkLink(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, bw_initial), history, state_trace)
+ : Link(model, name, props, lmm_constraint_new(ptask_maxmin_system, this, bw_initial), history, state_trace)
{
m_bwCurrent = bw_initial;
if (bw_trace)
public:
NetworkL07Model() : NetworkModel() {};
~NetworkL07Model() {surf_network_model = NULL;};
- NetworkLinkPtr createNetworkLink(const char *name,
+ LinkPtr createLink(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
double getConsumedEnergy() {THROW_UNIMPLEMENTED;};
};
-class LinkL07 : public NetworkLink {
+class LinkL07 : public Link {
public:
LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props,
double bw_initial,
p_maxminSystem = lmm_system_new(m_selectiveUpdate);
const char* lb_name = "__loopback__";
- routing_model_create(createNetworkLink(lb_name,
+ routing_model_create(createLink(lb_name,
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
SURF_LINK_FATPIPE, NULL));
m_haveGap = false;
}
-NetworkLinkPtr NetworkCm02Model::createNetworkLink(const char *name,
+LinkPtr NetworkCm02Model::createLink(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
double lat_initial,
tmgr_trace_t lat_trace,
e_surf_link_sharing_policy_t policy)
-: NetworkLink(model, name, props, lmm_constraint_new(system, this, constraint_value), history, state_trace)
+: Link(model, name, props, lmm_constraint_new(system, this, constraint_value), history, state_trace)
{
setState(state_init);
}
~NetworkCm02Model() {
}
- NetworkLinkPtr createNetworkLink(const char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties);
+ LinkPtr createLink(const char *name,
+ double bw_initial,
+ tmgr_trace_t bw_trace,
+ double lat_initial,
+ tmgr_trace_t lat_trace,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ e_surf_link_sharing_policy_t policy,
+ xbt_dict_t properties);
void addTraces();
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
* Resource *
************/
-class NetworkCm02Link : public NetworkLink {
+class NetworkCm02Link : public Link {
public:
NetworkCm02Link(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props,
lmm_system_t system,
* Callbacks *
*************/
-surf_callback(void, NetworkLinkPtr) networkLinkCreatedCallbacks;
-surf_callback(void, NetworkLinkPtr) networkLinkDestructedCallbacks;
-surf_callback(void, NetworkLinkPtr, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks;
+surf_callback(void, LinkPtr) networkLinkCreatedCallbacks;
+surf_callback(void, LinkPtr) networkLinkDestructedCallbacks;
+surf_callback(void, LinkPtr, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks;
surf_callback(void, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks;
surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate) networkCommunicateCallbacks;
if (link->policy == SURF_LINK_FULLDUPLEX) {
char *link_id;
link_id = bprintf("%s_UP", link->id);
- surf_network_model->createNetworkLink(link_id,
+ surf_network_model->createLink(link_id,
link->bandwidth,
link->bandwidth_trace,
link->latency,
link->state_trace, link->policy, link->properties);
xbt_free(link_id);
link_id = bprintf("%s_DOWN", link->id);
- surf_network_model->createNetworkLink(link_id,
+ surf_network_model->createLink(link_id,
link->bandwidth,
link->bandwidth_trace,
link->latency,
link->state_trace, link->policy, link->properties);
xbt_free(link_id);
} else {
- surf_network_model->createNetworkLink(link->id,
- link->bandwidth,
- link->bandwidth_trace,
- link->latency,
- link->latency_trace,
- link->state,
- link->state_trace, link->policy, link->properties);
+ surf_network_model->createLink(link->id,
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state,
+ link->state_trace, link->policy, link->properties);
}
}
* Resource *
************/
-NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props)
+Link::Link(NetworkModelPtr model, const char *name, xbt_dict_t props)
: Resource(model, name, props)
, p_latEvent(NULL)
{
surf_callback_emit(networkLinkCreatedCallbacks, this);
}
-NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props,
+Link::Link(NetworkModelPtr model, const char *name, xbt_dict_t props,
lmm_constraint_t constraint,
tmgr_history_t history,
tmgr_trace_t state_trace)
p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this);
}
-NetworkLink::~NetworkLink()
+Link::~Link()
{
surf_callback_emit(networkLinkDestructedCallbacks, this);
}
-bool NetworkLink::isUsed()
+bool Link::isUsed()
{
return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
}
-double NetworkLink::getLatency()
+double Link::getLatency()
{
return m_latCurrent;
}
-double NetworkLink::getBandwidth()
+double Link::getBandwidth()
{
return p_power.peak * p_power.scale;
}
-bool NetworkLink::isShared()
+bool Link::isShared()
{
return lmm_constraint_is_shared(getConstraint());
}
-void NetworkLink::setState(e_surf_resource_state_t state){
+void Link::setState(e_surf_resource_state_t state){
e_surf_resource_state_t old = Resource::getState();
Resource::setState(state);
surf_callback_emit(networkLinkStateChangedCallbacks, this, old, state);
class NetworkModel;
typedef NetworkModel *NetworkModelPtr;
-class NetworkLink;
-typedef NetworkLink *NetworkLinkPtr;
+class Link;
+typedef Link *LinkPtr;
class NetworkAction;
typedef NetworkAction *NetworkActionPtr;
*************/
/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emits the callbacks after NetworkLink creation
- * @details Callback functions have the following signature: `void(NetworkLinkPtr)`
+ * @brief Callbacks handler which emits the callbacks after Link creation
+ * @details Callback functions have the following signature: `void(LinkPtr)`
*/
-XBT_PUBLIC_DATA( surf_callback(void, NetworkLinkPtr)) networkLinkCreatedCallbacks;
+XBT_PUBLIC_DATA( surf_callback(void, LinkPtr)) networkLinkCreatedCallbacks;
/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emits the callbacks after NetworkLink destruction
- * @details Callback functions have the following signature: `void(NetworkLinkPtr)`
+ * @brief Callbacks handler which emits the callbacks after Link destruction
+ * @details Callback functions have the following signature: `void(LinkPtr)`
*/
-XBT_PUBLIC_DATA( surf_callback(void, NetworkLinkPtr)) networkLinkDestructedCallbacks;
+XBT_PUBLIC_DATA( surf_callback(void, LinkPtr)) networkLinkDestructedCallbacks;
/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emits the callbacks after NetworkLink State changed
- * @details Callback functions have the following signature: `void(NetworkLinkActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)`
+ * @brief Callbacks handler which emits the callbacks after Link State changed
+ * @details Callback functions have the following signature: `void(LinkActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)`
*/
-XBT_PUBLIC_DATA( surf_callback(void, NetworkLinkPtr, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks;
+XBT_PUBLIC_DATA( surf_callback(void, LinkPtr, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emits the callbacks after NetworkAction State changed
}
/**
- * @brief Create a NetworkLink
+ * @brief Create a Link
*
- * @param name The name of the NetworkLink
- * @param bw_initial The initial bandwidth of the NetworkLink in bytes per second
- * @param bw_trace The trace associated to the NetworkLink bandwidth
- * @param lat_initial The initial latency of the NetworkLink in seconds
- * @param lat_trace The trace associated to the NetworkLink latency
- * @param state_initial The initial NetworkLink (state)[e_surf_resource_state_t]
- * @param state_trace The trace associated to the NetworkLink (state)[e_surf_resource_state_t]
- * @param policy The sharing policy of the NetworkLink
+ * @param name The name of the Link
+ * @param bw_initial The initial bandwidth of the Link in bytes per second
+ * @param bw_trace The trace associated to the Link bandwidth
+ * @param lat_initial The initial latency of the Link in seconds
+ * @param lat_trace The trace associated to the Link latency
+ * @param state_initial The initial Link (state)[e_surf_resource_state_t]
+ * @param state_trace The trace associated to the Link (state)[e_surf_resource_state_t]
+ * @param policy The sharing policy of the Link
* @param properties Dictionary of properties associated to this Resource
- * @return The created NetworkLink
+ * @return The created Link
*/
- virtual NetworkLinkPtr createNetworkLink(const char *name,
+ virtual LinkPtr createLink(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties)=0;
- virtual void gapAppend(double /*size*/, const NetworkLinkPtr /*link*/, NetworkActionPtr /*action*/) {};
+ virtual void gapAppend(double /*size*/, const LinkPtr /*link*/, NetworkActionPtr /*action*/) {};
/**
* @brief Create a communication between two hosts.
************/
/** @ingroup SURF_network_interface
* @brief SURF network link interface class
- * @details A NetworkLink represents the link between two [hosts](\ref Host)
+ * @details A Link represents the link between two [hosts](\ref Host)
*/
-class NetworkLink : public Resource {
+class Link : public Resource {
public:
/**
- * @brief NetworkLink constructor
+ * @brief Link constructor
*
- * @param model The NetworkModel associated to this NetworkLink
- * @param name The name of the NetworkLink
- * @param props Dictionary of properties associated to this NetworkLink
+ * @param model The NetworkModel associated to this Link
+ * @param name The name of the Link
+ * @param props Dictionary of properties associated to this Link
*/
- NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props);
+ Link(NetworkModelPtr model, const char *name, xbt_dict_t props);
/**
- * @brief NetworkLink constructor
+ * @brief Link constructor
*
- * @param model The NetworkModel associated to this NetworkLink
- * @param name The name of the NetworkLink
- * @param props Dictionary of properties associated to this NetworkLink
+ * @param model The NetworkModel associated to this Link
+ * @param name The name of the Link
+ * @param props Dictionary of properties associated to this Link
* @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
* @param history [TODO]
* @param state_trace [TODO]
*/
- NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props,
+ Link(NetworkModelPtr model, const char *name, xbt_dict_t props,
lmm_constraint_t constraint,
tmgr_history_t history,
tmgr_trace_t state_trace);
- /** @brief NetworkLink destructor */
- ~NetworkLink();
+ /** @brief Link destructor */
+ ~Link();
- /** @brief Get the bandwidth in bytes per second of current NetworkLink */
+ /** @brief Get the bandwidth in bytes per second of current Link */
virtual double getBandwidth();
- /** @brief Update the bandwidth in bytes per second of current NetworkLink */
+ /** @brief Update the bandwidth in bytes per second of current Link */
virtual void updateBandwidth(double value, double date=surf_get_clock())=0;
- /** @brief Get the latency in seconds of current NetworkLink */
+ /** @brief Get the latency in seconds of current Link */
virtual double getLatency();
- /** @brief Update the latency in seconds of current NetworkLink */
+ /** @brief Update the latency in seconds of current Link */
virtual void updateLatency(double value, double date=surf_get_clock())=0;
/**
- * @brief Check if the NetworkLink is shared
+ * @brief Check if the Link is shared
*
* @return true if the current NetwokrLink is shared, false otherwise
*/
virtual bool isShared();
- /** @brief Check if the NetworkLink is used */
+ /** @brief Check if the Link is used */
bool isUsed();
void setState(e_surf_resource_state_t state);
if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free);
- NetworkLinkPtr net_link = surf_network_model->createNetworkLink(link->id,
+ LinkPtr net_link = surf_network_model->createLink(link->id,
link->bandwidth,
link->bandwidth_trace,
link->latency,
xbt_dict_free(&dict_socket);
}
-NetworkLinkPtr NetworkNS3Model::createNetworkLink(const char *name,
+LinkPtr NetworkNS3Model::createLink(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
NetworkNS3Link::NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
double bw_initial, double lat_initial)
- : NetworkLink(model, name, props)
+ : Link(model, name, props)
, p_lat(bprintf("%f", lat_initial))
, p_bdw(bprintf("%f", bw_initial))
, m_created(1)
NetworkNS3Model();
~NetworkNS3Model();
- NetworkLinkPtr createNetworkLink(const char *name,
+ LinkPtr createLink(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
/************
* Resource *
************/
-class NetworkNS3Link : public NetworkLink {
+class NetworkNS3Link : public Link {
public:
NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
double bw_initial, double lat_initial);
}
}
-void NetworkSmpiModel::gapAppend(double size, const NetworkLinkPtr link, NetworkActionPtr action)
+void NetworkSmpiModel::gapAppend(double size, const LinkPtr link, NetworkActionPtr action)
{
const char *src = link->getName();
xbt_fifo_t fifo;
NetworkSmpiModel();
~NetworkSmpiModel();
- void gapAppend(double size, const NetworkLinkPtr link, NetworkActionPtr action);
+ void gapAppend(double size, const LinkPtr link, NetworkActionPtr action);
void gapRemove(ActionPtr action);
double latencyFactor(double size);
double bandwidthFactor(double size);
}
void surf_as_cluster_set_backbone(AS_t as, void* backbone){
- static_cast<AsClusterPtr>(as)->p_backbone = static_cast<NetworkLinkPtr>(backbone);
+ static_cast<AsClusterPtr>(as)->p_backbone = static_cast<LinkPtr>(backbone);
}
const char *surf_model_name(surf_model_t model){
}
int surf_network_link_is_shared(surf_cpp_resource_t link){
- return static_cast<NetworkLinkPtr>(link)->isShared();
+ return static_cast<LinkPtr>(link)->isShared();
}
double surf_network_link_get_bandwidth(surf_cpp_resource_t link){
- return static_cast<NetworkLinkPtr>(link)->getBandwidth();
+ return static_cast<LinkPtr>(link)->getBandwidth();
}
double surf_network_link_get_latency(surf_cpp_resource_t link){
- return static_cast<NetworkLinkPtr>(link)->getLatency();
+ return static_cast<LinkPtr>(link)->getLatency();
}
xbt_dict_t surf_storage_get_content(surf_resource_t resource){
static XBT_INLINE void surf_link_free(void *r)
{
- delete static_cast<NetworkLinkPtr>(r);
+ delete static_cast<LinkPtr>(r);
}
static XBT_INLINE void surf_host_free(void *r)
info = xbt_dynar_get_as(p_linkUpDownList, src->getId() * p_nb_links_per_node, s_surf_parsing_link_up_down_t);
xbt_dynar_push_as(route->link_list, void *, info.link_up);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(info.link_up)->getLatency();
+ *lat += static_cast<LinkPtr>(info.link_up)->getLatency();
return;
}
if (info.link_up) { // link up
xbt_dynar_push_as(route->link_list, void *, info.link_up);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(info.link_up)->getLatency();
+ *lat += static_cast<LinkPtr>(info.link_up)->getLatency();
}
}
if (info.link_down) { // link down
xbt_dynar_push_as(route->link_list, void *, info.link_down);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(info.link_down)->getLatency();
+ *lat += static_cast<LinkPtr>(info.link_down)->getLatency();
}
if (p_has_limiter){ // limiter for receiver
info = xbt_dynar_get_as(p_linkUpDownList, dst->getId() * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t);
int parsePU(RoutingEdgePtr elm); /* A host or a router, whatever */
int parseAS(RoutingEdgePtr elm);
virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
- NetworkLinkPtr p_backbone;
+ LinkPtr p_backbone;
void *p_loopback;
RoutingEdgePtr p_router;
int p_has_limiter;
linkTemplate.policy = SURF_LINK_SHARED;
linkTemplate.id = bprintf("limiter_%d", id);
sg_platf_new_link(&linkTemplate);
- this->limiterLink = (NetworkLink*) xbt_lib_get_or_null(link_lib,
+ this->limiterLink = (Link*) xbt_lib_get_or_null(link_lib,
linkTemplate.id,
SURF_LINK_LEVEL);
free((void*)linkTemplate.id);
linkTemplate.policy = SURF_LINK_FATPIPE;
linkTemplate.id = bprintf("loopback_%d", id);
sg_platf_new_link(&linkTemplate);
- this->loopback = (NetworkLink*) xbt_lib_get_or_null(link_lib,
+ this->loopback = (Link*) xbt_lib_get_or_null(link_lib,
linkTemplate.id,
SURF_LINK_LEVEL);
free((void*)linkTemplate.id);
linkTemplate.id = bprintf("link_from_%d_to_%d_%d", downNode->id, upNode->id,
uniqueId);
sg_platf_new_link(&linkTemplate);
- NetworkLink* link;
+ Link* link;
std::string tmpID;
if (cluster->sharing_policy == SURF_LINK_FULLDUPLEX) {
tmpID = std::string(linkTemplate.id) + "_UP";
- link = (NetworkLink*) xbt_lib_get_or_null(link_lib, tmpID.c_str(),
+ link = (Link*) xbt_lib_get_or_null(link_lib, tmpID.c_str(),
SURF_LINK_LEVEL);
this->upLink = link; // check link?
tmpID = std::string(linkTemplate.id) + "_DOWN";
- link = (NetworkLink*) xbt_lib_get_or_null(link_lib, tmpID.c_str(),
+ link = (Link*) xbt_lib_get_or_null(link_lib, tmpID.c_str(),
SURF_LINK_LEVEL);
this->downLink = link; // check link ?
}
else {
- link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id,
+ link = (Link*) xbt_lib_get_or_null(link_lib, linkTemplate.id,
SURF_LINK_LEVEL);
this->upLink = link;
this->downLink = link;
/** Virtual link standing for the node global capacity.
*/
- NetworkLink* limiterLink;
+ Link* limiterLink;
/** If present, communications from this node to this node will pass through it
* instead of passing by an upper level switch.
*/
- NetworkLink* loopback;
+ Link* loopback;
FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level,
int position);
};
FatTreeNode *destination);
/** Link going up in the tree
*/
- NetworkLink *upLink;
+ Link *upLink;
/** Link going down in the tree
*/
- NetworkLink *downLink;
+ Link *downLink;
/** Upper end of the link
*/
FatTreeNode *upNode;
xbt_dynar_push_as(route->link_list, void *, info.link_up);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(info.link_up)->getLatency();
+ *lat += static_cast<LinkPtr>(info.link_up)->getLatency();
return;
}
xbt_dynar_push_as(route->link_list,void*,info.link_down);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(info.link_down)->getLatency();
+ *lat += static_cast<LinkPtr>(info.link_down)->getLatency();
}else{
xbt_dynar_push_as(route->link_list,void*,info.link_up);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(info.link_up)->getLatency();
+ *lat += static_cast<LinkPtr>(info.link_up)->getLatency();
}
current_node = next_node;
next_node = 0;
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(link)->getLatency();
+ *lat += static_cast<LinkPtr>(link)->getLatency();
}
}
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_insert_at(route->link_list, pos, &link);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(link)->getLatency();
+ *lat += static_cast<LinkPtr>(link)->getLatency();
pos++;
}
}
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_unshift(route->link_list, &link);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(link)->getLatency();
+ *lat += static_cast<LinkPtr>(link)->getLatency();
}
size++;
}
xbt_dynar_foreach(links, cpt, link) {
xbt_dynar_push_as(res->link_list, sg_routing_link_t, link);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(link)->getLatency();
+ *lat += static_cast<LinkPtr>(link)->getLatency();
}
prev_dst_gw = e_route->gw_dst;
xbt_dynar_foreach(e_route->link_list, cpt, link) {
xbt_dynar_push(res->link_list, &link);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(link)->getLatency();
+ *lat += static_cast<LinkPtr>(link)->getLatency();
}
}
}
sg_platf_route_cbarg_t new_e_route = NULL;
if (e_route_bypass) {
- NetworkLinkPtr link;
+ LinkPtr link;
unsigned int cpt = 0;
new_e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
new_e_route->gw_src = e_route_bypass->gw_src;
if(info.link_up) { // link up
xbt_dynar_push_as(route->link_list, void*, info.link_up);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(info.link_up)->getLatency();
+ *lat += static_cast<LinkPtr>(info.link_up)->getLatency();
}
}
src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL);
if(info.link_down) { // link down
xbt_dynar_push_as(route->link_list,void*,info.link_down);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(info.link_down)->getLatency();
+ *lat += static_cast<LinkPtr>(info.link_down)->getLatency();
}
}
dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL);
