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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
routing
/
AsImpl.cpp
diff --git
a/src/kernel/routing/AsImpl.cpp
b/src/kernel/routing/AsImpl.cpp
index
30fe085
..
0a84c25
100644
(file)
--- a/
src/kernel/routing/AsImpl.cpp
+++ b/
src/kernel/routing/AsImpl.cpp
@@
-7,6
+7,7
@@
#include "simgrid/s4u/host.hpp"
#include "src/kernel/routing/AsImpl.hpp"
#include "simgrid/s4u/host.hpp"
#include "src/kernel/routing/AsImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(AsImpl,surf, "Implementation of S4U autonomous systems");
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(AsImpl,surf, "Implementation of S4U autonomous systems");
@@
-24,19
+25,30
@@
namespace simgrid {
xbt_lib_set(as_router_lib, name, ROUTING_ASR_LEVEL, static_cast<void*>(netcard_));
XBT_DEBUG("AS '%s' created with the id '%d'", name, netcard_->id());
}
xbt_lib_set(as_router_lib, name, ROUTING_ASR_LEVEL, static_cast<void*>(netcard_));
XBT_DEBUG("AS '%s' created with the id '%d'", name, netcard_->id());
}
- AsImpl::~AsImpl() = default;
-
void AsImpl::attachHost(s4u::Host* hos
t)
+
simgrid::s4u::Host* AsImpl::createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmoun
t)
{
{
+ simgrid::s4u::Host* res = new simgrid::s4u::Host(name);
+
if (hierarchy_ == RoutingMode::unset)
hierarchy_ = RoutingMode::base;
if (hierarchy_ == RoutingMode::unset)
hierarchy_ = RoutingMode::base;
- host->pimpl_netcard = new NetCardImpl(host->name().c_str(), NetCard::Type::Host, this);
+ res->pimpl_netcard = new NetCardImpl(name, NetCard::Type::Host, this);
+
+ surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
+
+ return res;
}
}
-
xbt_dynar_t AsImpl::getOneLinkRoutes(
)
+
void AsImpl::getOneLinkRoutes(std::vector<Onelink*>* accumulator
)
{
{
- return nullptr;
+ // recursing only. I have no route myself :)
+ char* key;
+ xbt_dict_cursor_t cursor = nullptr;
+ AsImpl* rc_child;
+ xbt_dict_foreach (children(), cursor, key, rc_child) {
+ rc_child->getOneLinkRoutes(accumulator);
+ }
}
/** @brief Get the common ancestor and its first children in each line leading to src and dst
}
/** @brief Get the common ancestor and its first children in each line leading to src and dst
@@
-159,13
+171,13
@@
namespace simgrid {
/* Base case, no recursion is needed */
if (dst->containingAS() == this && src->containingAS() == this) {
if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) {
/* Base case, no recursion is needed */
if (dst->containingAS() == this && src->containingAS() == this) {
if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) {
-
std::vector<surf::Link*>
* bypassedRoute = bypassRoutes_.at({src, dst});
- for (surf::Link* link :
*bypassedRoute
) {
+
AsRoute
* bypassedRoute = bypassRoutes_.at({src, dst});
+ for (surf::Link* link :
bypassedRoute->links
) {
links->push_back(link);
if (latency)
*latency += link->latency();
}
links->push_back(link);
if (latency)
*latency += link->latency();
}
- XBT_DEBUG("Found a bypass route with %zu links", bypassedRoute->size());
+ XBT_DEBUG("Found a bypass route with %zu links", bypassedRoute->
links.
size());
return true;
}
return false;
return true;
}
return false;
@@
-173,7
+185,6
@@
namespace simgrid {
/* Engage recursive search */
/* Engage recursive search */
- std::vector<surf::Link*>* bypassedRoute = nullptr;
/* (1) find the path to the root routing component */
std::vector<AsImpl*> path_src;
/* (1) find the path to the root routing component */
std::vector<AsImpl*> path_src;
@@
-202,6
+213,8
@@
namespace simgrid {
int max_index = std::max(max_index_src, max_index_dst);
int max_index = std::max(max_index_src, max_index_dst);
+ /* (3) Search for a bypass making the path up to the ancestor useless */
+ AsRoute* bypassedRoute = nullptr;
std::pair<kernel::routing::NetCard*, kernel::routing::NetCard*> key;
for (int max = 0; max <= max_index; max++) {
for (int i = 0; i < max; i++) {
std::pair<kernel::routing::NetCard*, kernel::routing::NetCard*> key;
for (int max = 0; max <= max_index; max++) {
for (int i = 0; i < max; i++) {
@@
-233,12
+246,17
@@
namespace simgrid {
}
}
}
}
+ /* (4) If we have the bypass, use it. If not, caller will do the Right Thing. */
if (bypassedRoute) {
if (bypassedRoute) {
- for (surf::Link* link : *bypassedRoute) {
+ if (src != key.first)
+ getRouteRecursive(src, const_cast<NetCard*>(bypassedRoute->gw_src), links, latency);
+ for (surf::Link* link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
}
links->push_back(link);
if (latency)
*latency += link->latency();
}
+ if (dst != key.second)
+ getRouteRecursive(const_cast<NetCard*>(bypassedRoute->gw_dst), dst, links, latency);
return true;
}
return false;
return true;
}
return false;