A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a s4u::Link class, at least
[simgrid.git]
/
src
/
kernel
/
routing
/
RoutedZone.cpp
diff --git
a/src/kernel/routing/RoutedZone.cpp
b/src/kernel/routing/RoutedZone.cpp
index
5209a95
..
61e80c4
100644
(file)
--- a/
src/kernel/routing/RoutedZone.cpp
+++ b/
src/kernel/routing/RoutedZone.cpp
@@
-9,7
+9,7
@@
#include "xbt/log.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/sysdep.h"
-#include "src/kernel/routing/Net
Card
.hpp"
+#include "src/kernel/routing/Net
Point
.hpp"
#include "src/kernel/routing/RoutedZone.hpp"
#include "src/surf/network_interface.hpp"
#include "src/kernel/routing/RoutedZone.hpp"
#include "src/surf/network_interface.hpp"
@@
-82,7
+82,7
@@
void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
continue;
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
continue;
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- route->link_list = new std::vector<
Link
*>();
+ route->link_list = new std::vector<
surf::LinkImpl
*>();
getLocalRoute(my_src, my_dst, route, nullptr);
getLocalRoute(my_src, my_dst, route, nullptr);
@@
-134,7
+134,7
@@
sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
sg_platf_route_cbarg_t result;
result = xbt_new0(s_sg_platf_route_cbarg_t, 1);
sg_platf_route_cbarg_t result;
result = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- result->link_list = new std::vector<
Link
*>();
+ result->link_list = new std::vector<
surf::LinkImpl
*>();
xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive,
"The hierarchy of this netzone is neither BASIC nor RECURSIVE, I'm lost here.");
xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive,
"The hierarchy of this netzone is neither BASIC nor RECURSIVE, I'm lost here.");
@@
-157,7
+157,7
@@
sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
return result;
}
return result;
}
-void RoutedZone::getRouteCheckParams(Net
Card* src, NetCard
* dst)
+void RoutedZone::getRouteCheckParams(Net
Point* src, NetPoint
* dst)
{
xbt_assert(src, "Cannot find a route from nullptr to %s", dst->cname());
xbt_assert(dst, "Cannot find a route from %s to nullptr", src->cname());
{
xbt_assert(src, "Cannot find a route from nullptr to %s", dst->cname());
xbt_assert(dst, "Cannot find a route from %s to nullptr", src->cname());
@@
-175,8
+175,8
@@
void RoutedZone::getRouteCheckParams(NetCard* src, NetCard* dst)
}
void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
{
}
void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
{
- Net
Card* src
= route->src;
- Net
Card* dst
= route->dst;
+ Net
Point* src
= route->src;
+ Net
Point* dst
= route->dst;
const char* srcName = src->cname();
const char* dstName = dst->cname();
const char* srcName = src->cname();
const char* dstName = dst->cname();