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
smpiff: proper handling of non-f77 source files
[simgrid.git]
/
src
/
kernel
/
routing
/
ClusterZone.cpp
diff --git
a/src/kernel/routing/ClusterZone.cpp
b/src/kernel/routing/ClusterZone.cpp
index ad3018732340c7cb1df0cb53c161aafac9d9ee2a..aefe976b627d5a21671a2ae57410c8be3d441b55 100644
(file)
--- a/
src/kernel/routing/ClusterZone.cpp
+++ b/
src/kernel/routing/ClusterZone.cpp
@@
-1,12
+1,13
@@
-/* Copyright (c) 2009-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-201
8
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "s
rc
/kernel/routing/ClusterZone.hpp"
-#include "s
rc
/kernel/routing/NetPoint.hpp"
-#include "s
rc
/kernel/routing/RoutedZone.hpp"
+#include "s
imgrid
/kernel/routing/ClusterZone.hpp"
+#include "s
imgrid
/kernel/routing/NetPoint.hpp"
+#include "s
imgrid
/kernel/routing/RoutedZone.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include "src/surf/xml/platf_private.hpp" // FIXME: RouteCreationArgs and friends
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
@@
-20,7
+21,7
@@
ClusterZone::ClusterZone(NetZone* father, std::string name) : NetZoneImpl(father
{
}
{
}
-void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst,
sg_platf_route_cbarg_t
route, double* lat)
+void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst,
RouteCreationArgs*
route, double* lat)
{
XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id());
xbt_assert(not privateLinks_.empty(),
{
XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id());
xbt_assert(not privateLinks_.empty(),
@@
-130,7
+131,7
@@
void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, in
surf::LinkImpl *linkUp;
surf::LinkImpl *linkDown;
surf::LinkImpl *linkUp;
surf::LinkImpl *linkDown;
- if (link.policy == SURF_LINK_
FULL
DUPLEX) {
+ if (link.policy == SURF_LINK_
SPLIT
DUPLEX) {
linkUp = surf::LinkImpl::byName(link_id + "_UP");
linkDown = surf::LinkImpl::byName(link_id + "_DOWN");
} else {
linkUp = surf::LinkImpl::byName(link_id + "_UP");
linkDown = surf::LinkImpl::byName(link_id + "_DOWN");
} else {