From 1c91d656133ea5c62b304f955705d7275ed5030f Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 18 Jul 2015 16:17:26 +0200 Subject: [PATCH] Rename NetworkLink type to Link Yup, that's an useless cosmetics. --- ChangeLog | 3 + buildtools/Cmake/DefinePackages.cmake | 2 +- .../ReservationPlugin.java | 4 +- examples/java/surfPlugin/TracePlugin.java | 26 +++-- examples/java/surfPlugin/surf_plugin.tesh | 72 ++++++------ .../surf/{NetworkLink.java => Link.java} | 32 +++--- .../java/org/simgrid/surf/NetworkAction.java | 2 +- .../java/org/simgrid/surf/Plugin.java | 24 ++-- src/bindings/java/org/simgrid/surf/Surf.java | 4 +- .../java/org/simgrid/surf/SurfJNI.java | 40 +++---- .../java/org/simgrid/surf/surfJAVA_wrap.cxx | 104 +++++++++--------- .../java/org/simgrid/surf/surfJAVA_wrap.h | 6 +- src/bindings/java/surf.i | 26 ++--- src/bindings/java/surf_swig.cpp | 8 +- src/bindings/java/surf_swig.hpp | 16 +-- src/bindings/java/surfdoc.i | 12 +- src/surf/host_interface.hpp | 4 +- src/surf/host_ptask_L07.cpp | 6 +- src/surf/host_ptask_L07.hpp | 4 +- src/surf/network_cm02.cpp | 6 +- src/surf/network_cm02.hpp | 20 ++-- src/surf/network_interface.cpp | 40 +++---- src/surf/network_interface.hpp | 86 +++++++-------- src/surf/network_ns3.cpp | 6 +- src/surf/network_ns3.hpp | 4 +- src/surf/network_smpi.cpp | 2 +- src/surf/network_smpi.hpp | 2 +- src/surf/surf_c_bindings.cpp | 8 +- src/surf/surf_interface.cpp | 2 +- src/surf/surf_routing_cluster.cpp | 6 +- src/surf/surf_routing_cluster.hpp | 2 +- src/surf/surf_routing_cluster_fat_tree.cpp | 12 +- src/surf/surf_routing_cluster_fat_tree.hpp | 8 +- src/surf/surf_routing_cluster_torus.cpp | 6 +- src/surf/surf_routing_dijkstra.cpp | 6 +- src/surf/surf_routing_floyd.cpp | 2 +- src/surf/surf_routing_full.cpp | 2 +- src/surf/surf_routing_generic.cpp | 2 +- src/surf/surf_routing_vivaldi.cpp | 4 +- 39 files changed, 316 insertions(+), 305 deletions(-) rename src/bindings/java/org/simgrid/surf/{NetworkLink.java => Link.java} (61%) diff --git a/ChangeLog b/ChangeLog index fced57faf1..f1aee905a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ + surf.java: + * class NetworkLink renamed to Link + SimGrid (3.12) NOT RELEASED; urgency=low cMSG: diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 7e8a112dd7..68c40d33df 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -464,7 +464,7 @@ set(JSURF_JAVA_GENERATED_SRC 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 diff --git a/examples/java/reservationSurfPlugin/ReservationPlugin.java b/examples/java/reservationSurfPlugin/ReservationPlugin.java index 8cf24b7e23..c23c31d5de 100644 --- a/examples/java/reservationSurfPlugin/ReservationPlugin.java +++ b/examples/java/reservationSurfPlugin/ReservationPlugin.java @@ -28,7 +28,7 @@ public class ReservationPlugin extends Plugin { } 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 [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 @@ -14,28 +14,28 @@ $ java -classpath ${classpath:=.} surfPlugin/TestPlugin ${srcdir:=.}/../platform > [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 @@ -52,15 +52,15 @@ $ java -classpath ${classpath:=.} surfPlugin/TestPlugin ${srcdir:=.}/../platform > [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 diff --git a/src/bindings/java/org/simgrid/surf/NetworkLink.java b/src/bindings/java/org/simgrid/surf/Link.java similarity index 61% rename from src/bindings/java/org/simgrid/surf/NetworkLink.java rename to src/bindings/java/org/simgrid/surf/Link.java index 7bef76901d..d0b1d6cc9f 100644 --- a/src/bindings/java/org/simgrid/surf/NetworkLink.java +++ b/src/bindings/java/org/simgrid/surf/Link.java @@ -11,15 +11,15 @@ package org.simgrid.surf; /** * 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; } @@ -31,24 +31,24 @@ public class NetworkLink extends Resource { 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; iDeleteLocalRef(swigjobj); } -void SwigDirector_Plugin::networkLinkCreatedCallback(NetworkLink *link) { +void SwigDirector_Plugin::networkLinkCreatedCallback(Link *link) { JNIEnvWrapper swigjnienv(this) ; JNIEnv * jenv = swigjnienv.getJNIEnv() ; jobject swigjobj = (jobject) NULL ; @@ -1179,7 +1179,7 @@ void SwigDirector_Plugin::networkLinkCreatedCallback(NetworkLink *link) { } 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 { @@ -1188,7 +1188,7 @@ void SwigDirector_Plugin::networkLinkCreatedCallback(NetworkLink *link) { 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 ; @@ -1200,7 +1200,7 @@ void SwigDirector_Plugin::networkLinkDestructedCallback(NetworkLink *link) { } 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 { @@ -1209,7 +1209,7 @@ void SwigDirector_Plugin::networkLinkDestructedCallback(NetworkLink *link) { 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 ; @@ -1223,7 +1223,7 @@ void SwigDirector_Plugin::networkLinkStateChangedCallback(NetworkLink *link, e_s } 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); @@ -1307,13 +1307,13 @@ void SwigDirector_Plugin::swig_connect_director(JNIEnv *jenv, jobject jself, jcl "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 @@ -2322,7 +2322,7 @@ SWIGEXPORT jlongArray JNICALL Java_org_simgrid_surf_SurfJNI_getRoute(JNIEnv *jen jlongArray jresult = 0 ; char *arg1 = (char *) 0 ; char *arg2 = (char *) 0 ; - NetworkLinkDynar result; + LinkDynar result; (void)jenv; (void)jcls; @@ -2341,7 +2341,7 @@ SWIGEXPORT jlongArray JNICALL Java_org_simgrid_surf_SurfJNI_getRoute(JNIEnv *jen 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; @@ -2537,98 +2537,98 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1cpuActionStateChan } -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 ; @@ -2637,7 +2637,7 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkStateCh (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); @@ -2646,7 +2646,7 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkStateCh 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 ; @@ -2655,7 +2655,7 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Plugin_1networkLinkStateCh (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); @@ -3530,97 +3530,97 @@ SWIGEXPORT void JNICALL Java_org_simgrid_surf_SurfJNI_Cpu_1change_1ownership(JNI } -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); } @@ -4081,11 +4081,11 @@ SWIGEXPORT jlong JNICALL Java_org_simgrid_surf_SurfJNI_Cpu_1SWIGUpcast(JNIEnv *j 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; } diff --git a/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h b/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h index c3567e3622..a21ce12f16 100644 --- a/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h +++ b/src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h @@ -21,9 +21,9 @@ public: 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: diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i index 660d85bfab..a9e121ea85 100644 --- a/src/bindings/java/surf.i +++ b/src/bindings/java/surf.i @@ -99,7 +99,7 @@ GETDIRECTOR(CpuAction) %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[]" @@ -137,19 +137,19 @@ public: } }; -/* 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; @@ -298,10 +298,10 @@ public: 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(); diff --git a/src/bindings/java/surf_swig.cpp b/src/bindings/java/surf_swig.cpp index c1e2986ec8..b3066cd363 100644 --- a/src/bindings/java/surf_swig.cpp +++ b/src/bindings/java/surf_swig.cpp @@ -38,7 +38,7 @@ void setCpu(char *name, Cpu *cpu) { 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"); @@ -65,15 +65,15 @@ void Plugin::activateCpuActionStateChangedCallback(){ } -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)); } diff --git a/src/bindings/java/surf_swig.hpp b/src/bindings/java/surf_swig.hpp index 4211ce152b..eaea5088c8 100644 --- a/src/bindings/java/surf_swig.hpp +++ b/src/bindings/java/surf_swig.hpp @@ -10,7 +10,7 @@ #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(); @@ -22,7 +22,7 @@ void setCpuModel(CpuModel *cpuModel); void setCpu(char *name, Cpu *cpu); -NetworkLinkDynar getRoute(char *srcName, char *dstName); +LinkDynar getRoute(char *srcName, char *dstName); class Plugin { public: @@ -43,14 +43,14 @@ 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) {} diff --git a/src/bindings/java/surfdoc.i b/src/bindings/java/surfdoc.i index 24eb9a9ce5..02a6c89f46 100644 --- a/src/bindings/java/surfdoc.i +++ b/src/bindings/java/surfdoc.i @@ -247,30 +247,30 @@ 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 */ @@ -381,7 +381,7 @@ %typemap(javaimports) NetworkAction " /** * An network action created by network model - * @see NetworkLink + * @see Link */" %javamethodmodifiers NetworkAction::getLatency() " diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index 71ee1b7430..3b1defdb35 100644 --- a/src/surf/host_interface.hpp +++ b/src/surf/host_interface.hpp @@ -128,7 +128,7 @@ public: ************/ /** @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: @@ -353,7 +353,7 @@ 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 diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index e7ce1752d6..698247d41d 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -53,7 +53,7 @@ HostL07Model::HostL07Model() : HostModel("Host ptask_L07") { 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, @@ -340,7 +340,7 @@ CpuPtr CpuL07Model::createCpu(const char *name, xbt_dynar_t powerPeak, 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, @@ -486,7 +486,7 @@ LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props, 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) diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp index c848b52124..9a5c9cb548 100644 --- a/src/surf/host_ptask_L07.hpp +++ b/src/surf/host_ptask_L07.hpp @@ -79,7 +79,7 @@ class NetworkL07Model : public NetworkModel { 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, @@ -137,7 +137,7 @@ public: 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, diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 37fc2717d8..2228d67fe6 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -186,7 +186,7 @@ void NetworkCm02Model::initialize() 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)); @@ -201,7 +201,7 @@ void NetworkCm02Model::initialize() 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, @@ -537,7 +537,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02ModelPtr model, const char *name, xb 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); diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 6eaa6a0996..83750f4d1e 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -48,15 +48,15 @@ public: } ~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); @@ -68,7 +68,7 @@ public: * Resource * ************/ -class NetworkCm02Link : public NetworkLink { +class NetworkCm02Link : public Link { public: NetworkCm02Link(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props, lmm_system_t system, diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index 63f13561a8..542c958df7 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -17,9 +17,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, * 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; @@ -27,7 +27,7 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ 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, @@ -36,7 +36,7 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ 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, @@ -45,13 +45,13 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){ 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); } } @@ -109,14 +109,14 @@ double NetworkModel::shareResourcesFull(double now) * 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) @@ -128,32 +128,32 @@ NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t pro 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); diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 2fdd71e204..ba829aace7 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -16,8 +16,8 @@ class NetworkModel; typedef NetworkModel *NetworkModelPtr; -class NetworkLink; -typedef NetworkLink *NetworkLinkPtr; +class Link; +typedef Link *LinkPtr; class NetworkAction; typedef NetworkAction *NetworkActionPtr; @@ -27,22 +27,22 @@ 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 @@ -93,20 +93,20 @@ public: } /** - * @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, @@ -116,7 +116,7 @@ public: 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. @@ -183,57 +183,57 @@ public: ************/ /** @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); diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 75effecaf4..2550a71c15 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -57,7 +57,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) 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, @@ -294,7 +294,7 @@ NetworkNS3Model::~NetworkNS3Model() { 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, @@ -425,7 +425,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) 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) diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 8a29dfd383..2807f8fc5e 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -37,7 +37,7 @@ public: NetworkNS3Model(); ~NetworkNS3Model(); - NetworkLinkPtr createNetworkLink(const char *name, + LinkPtr createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -57,7 +57,7 @@ public: /************ * 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); diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index e5967be727..9321f8e6dc 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -104,7 +104,7 @@ NetworkSmpiModel::~NetworkSmpiModel(){ } } -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; diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp index a27ef04fb9..8421ce7d47 100644 --- a/src/surf/network_smpi.hpp +++ b/src/surf/network_smpi.hpp @@ -26,7 +26,7 @@ public: 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); diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index e32a3e0223..298cae73c4 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -224,7 +224,7 @@ void *surf_as_cluster_get_backbone(AS_t as){ } void surf_as_cluster_set_backbone(AS_t as, void* backbone){ - static_cast(as)->p_backbone = static_cast(backbone); + static_cast(as)->p_backbone = static_cast(backbone); } const char *surf_model_name(surf_model_t model){ @@ -490,15 +490,15 @@ void surf_vm_set_affinity(surf_resource_t vm, surf_resource_t cpu, unsigned long } int surf_network_link_is_shared(surf_cpp_resource_t link){ - return static_cast(link)->isShared(); + return static_cast(link)->isShared(); } double surf_network_link_get_bandwidth(surf_cpp_resource_t link){ - return static_cast(link)->getBandwidth(); + return static_cast(link)->getBandwidth(); } double surf_network_link_get_latency(surf_cpp_resource_t link){ - return static_cast(link)->getLatency(); + return static_cast(link)->getLatency(); } xbt_dict_t surf_storage_get_content(surf_resource_t resource){ diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 136414e95e..43c529656e 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -362,7 +362,7 @@ static XBT_INLINE void routing_asr_prop_free(void *p) static XBT_INLINE void surf_link_free(void *r) { - delete static_cast(r); + delete static_cast(r); } static XBT_INLINE void surf_host_free(void *r) diff --git a/src/surf/surf_routing_cluster.cpp b/src/surf/surf_routing_cluster.cpp index 02c11ba7b1..87321b40f2 100644 --- a/src/surf/surf_routing_cluster.cpp +++ b/src/surf/surf_routing_cluster.cpp @@ -41,7 +41,7 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl 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(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); return; } @@ -55,7 +55,7 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl if (info.link_up) { // link up xbt_dynar_push_as(route->link_list, void *, info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } } @@ -72,7 +72,7 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl if (info.link_down) { // link down xbt_dynar_push_as(route->link_list, void *, info.link_down); if (lat) - *lat += static_cast(info.link_down)->getLatency(); + *lat += static_cast(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); diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp index 294fe2b5ab..06570b4f3f 100644 --- a/src/surf/surf_routing_cluster.hpp +++ b/src/surf/surf_routing_cluster.hpp @@ -39,7 +39,7 @@ public: 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; diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp index 2421ea5496..c12a9471cf 100644 --- a/src/surf/surf_routing_cluster_fat_tree.cpp +++ b/src/surf/surf_routing_cluster_fat_tree.cpp @@ -501,7 +501,7 @@ FatTreeNode::FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level, 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); @@ -514,7 +514,7 @@ FatTreeNode::FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level, 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); @@ -535,20 +535,20 @@ FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster, 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; diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp index 2f924adfc9..1b3c460ab8 100644 --- a/src/surf/surf_routing_cluster_fat_tree.hpp +++ b/src/surf/surf_routing_cluster_fat_tree.hpp @@ -52,11 +52,11 @@ public: /** 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); }; @@ -74,10 +74,10 @@ public: 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; diff --git a/src/surf/surf_routing_cluster_torus.cpp b/src/surf/surf_routing_cluster_torus.cpp index 52d0c35960..91f69e6d10 100644 --- a/src/surf/surf_routing_cluster_torus.cpp +++ b/src/surf/surf_routing_cluster_torus.cpp @@ -133,7 +133,7 @@ void AsClusterTorus::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_push_as(route->link_list, void *, info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); return; } @@ -222,12 +222,12 @@ void AsClusterTorus::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_push_as(route->link_list,void*,info.link_down); if (lat) - *lat += static_cast(info.link_down)->getLatency(); + *lat += static_cast(info.link_down)->getLatency(); }else{ xbt_dynar_push_as(route->link_list,void*,info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } current_node = next_node; next_node = 0; diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp index 7c1ae30534..dcc2bb1e4d 100644 --- a/src/surf/surf_routing_dijkstra.cpp +++ b/src/surf/surf_routing_dijkstra.cpp @@ -256,7 +256,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } } @@ -364,7 +364,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_insert_at(route->link_list, pos, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); pos++; } } @@ -373,7 +373,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } size++; } diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index e87df4f4e7..033478aaa5 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -124,7 +124,7 @@ void AsFloyd::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_plat xbt_dynar_foreach(links, cpt, link) { xbt_dynar_push_as(res->link_list, sg_routing_link_t, link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } prev_dst_gw = e_route->gw_dst; diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp index 4c74df4d96..3f056641a1 100644 --- a/src/surf/surf_routing_full.cpp +++ b/src/surf/surf_routing_full.cpp @@ -127,7 +127,7 @@ void AsFull::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf xbt_dynar_foreach(e_route->link_list, cpt, link) { xbt_dynar_push(res->link_list, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } } } diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp index 407f50caed..6c81ae1b2a 100644 --- a/src/surf/surf_routing_generic.cpp +++ b/src/surf/surf_routing_generic.cpp @@ -322,7 +322,7 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, 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; diff --git a/src/surf/surf_routing_vivaldi.cpp b/src/surf/surf_routing_vivaldi.cpp index efabf717bc..30692ce646 100644 --- a/src/surf/surf_routing_vivaldi.cpp +++ b/src/surf/surf_routing_vivaldi.cpp @@ -51,7 +51,7 @@ void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl if(info.link_up) { // link up xbt_dynar_push_as(route->link_list, void*, info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } } src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL); @@ -73,7 +73,7 @@ void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl if(info.link_down) { // link down xbt_dynar_push_as(route->link_list,void*,info.link_down); if (lat) - *lat += static_cast(info.link_down)->getLatency(); + *lat += static_cast(info.link_down)->getLatency(); } } dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL); -- 2.20.1