X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8e414e235d6dec3d30c349a61de69eb88060ff4..54e35ebda7e4ffacd769653b8ebb8ba93c7298bf:/src/bindings/java/surf_swig.cpp diff --git a/src/bindings/java/surf_swig.cpp b/src/bindings/java/surf_swig.cpp index c1e2986ec8..b7f62f851a 100644 --- a/src/bindings/java/surf_swig.cpp +++ b/src/bindings/java/surf_swig.cpp @@ -38,12 +38,12 @@ 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"); xbt_assert(dst,"Cannot get the route to a NULL destination"); - xbt_dynar_t route = xbt_dynar_new(sizeof(RoutingEdgePtr), NULL); + xbt_dynar_t route = xbt_dynar_new(sizeof(RoutingEdge*), NULL); routing_platf->getRouteAndLatency(src, dst, &route, NULL); return route; } @@ -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)); }