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 new entry in Release_Notes.
[simgrid.git]
/
include
/
simgrid
/
kernel
/
routing
/
FullZone.hpp
diff --git
a/include/simgrid/kernel/routing/FullZone.hpp
b/include/simgrid/kernel/routing/FullZone.hpp
index 7584894b4cc3f80c2c932b690365fecceffd1cb0..3a83895bb31db1849898c72fceafea160f3cacf0 100644
(file)
--- a/
include/simgrid/kernel/routing/FullZone.hpp
+++ b/
include/simgrid/kernel/routing/FullZone.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-202
3
. 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. */
@@
-8,9
+8,7
@@
#include <simgrid/kernel/routing/RoutedZone.hpp>
#include <simgrid/kernel/routing/RoutedZone.hpp>
-namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace simgrid::kernel::routing {
/** @ingroup ROUTING_API
* @brief NetZone with an explicit routing provided by the user
/** @ingroup ROUTING_API
* @brief NetZone with an explicit routing provided by the user
@@
-19,22
+17,20
@@
namespace routing {
* computational requirements, but also the highest memory requirements (both in platform file and in memory).
*/
class XBT_PRIVATE FullZone : public RoutedZone {
* computational requirements, but also the highest memory requirements (both in platform file and in memory).
*/
class XBT_PRIVATE FullZone : public RoutedZone {
+ std::vector<std::vector<std::unique_ptr<Route>>> routing_table_;
+ void do_seal() override;
+ /** @brief Check and resize (if necessary) the routing table */
+ void check_routing_table();
+
public:
public:
-
explicit FullZone(const std::string& name)
;
+
using RoutedZone::RoutedZone
;
FullZone(const FullZone&) = delete;
FullZone& operator=(const FullZone) = delete;
FullZone(const FullZone&) = delete;
FullZone& operator=(const FullZone) = delete;
- ~FullZone() override;
- void get_local_route(
NetPoint* src, NetPoint* dst, RouteCreationArgs
* into, double* latency) override;
+ void get_local_route(
const NetPoint* src, const NetPoint* dst, Route
* into, double* latency) override;
void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- std::vector<resource::LinkImpl*>& link_list, bool symmetrical) override;
-
-private:
- std::vector<RouteCreationArgs*> routing_table_;
- void do_seal() override;
+ const std::vector<s4u::LinkInRoute>& link_list, bool symmetrical) override;
};
};
-} // namespace routing
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::routing
#endif /* SIMGRID_ROUTING_FULL_HPP_ */
#endif /* SIMGRID_ROUTING_FULL_HPP_ */