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
guess what? bugs and smells
[simgrid.git]
/
src
/
surf
/
surf_routing.hpp
diff --git
a/src/surf/surf_routing.hpp
b/src/surf/surf_routing.hpp
index
bf34da1
..
8645ad7
100644
(file)
--- a/
src/surf/surf_routing.hpp
+++ b/
src/surf/surf_routing.hpp
@@
-12,11
+12,10
@@
#include "surf_interface.hpp"
#include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML.
#include "surf_interface.hpp"
#include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML.
-#include "src/
surf
/AsImpl.hpp"
+#include "src/
kernel/routing
/AsImpl.hpp"
#include <float.h>
#include <vector>
#include <float.h>
#include <vector>
-#include <map>
SG_BEGIN_DECL()
XBT_PUBLIC(void) routing_model_create(Link *loopback);
SG_BEGIN_DECL()
XBT_PUBLIC(void) routing_model_create(Link *loopback);
@@
-25,7
+24,8
@@
XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_
SG_END_DECL()
namespace simgrid {
SG_END_DECL()
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace routing {
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) netcardCreatedCallbacks;
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) netcardCreatedCallbacks;
@@
-65,7
+65,7
@@
public:
{
if (containingAS != nullptr)
id_ = containingAS->addComponent(this);
{
if (containingAS != nullptr)
id_ = containingAS->addComponent(this);
- simgrid::
surf
::netcardCreatedCallbacks(this);
+ simgrid::
kernel::routing
::netcardCreatedCallbacks(this);
}
~NetCardImpl() { xbt_free(name_);};
}
~NetCardImpl() { xbt_free(name_);};
@@
-101,7
+101,7
@@
public:
*/
XBT_PUBLIC_CLASS RoutingPlatf {
public:
*/
XBT_PUBLIC_CLASS RoutingPlatf {
public:
- RoutingPlatf(Link *loopback);
+
explicit
RoutingPlatf(Link *loopback);
~RoutingPlatf();
AsImpl *root_ = nullptr;
Link *loopback_;
~RoutingPlatf();
AsImpl *root_ = nullptr;
Link *loopback_;
@@
-109,7
+109,6
@@
public:
void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
};
void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
};
-}
-}
+}}}
#endif /* NETWORK_ROUTING_HPP_ */
#endif /* NETWORK_ROUTING_HPP_ */