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 branches 'master' and 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
surf_routing.hpp
diff --git
a/src/surf/surf_routing.hpp
b/src/surf/surf_routing.hpp
index
420557e
..
bbe4e16
100644
(file)
--- a/
src/surf/surf_routing.hpp
+++ b/
src/surf/surf_routing.hpp
@@
-24,6
+24,7
@@
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 kernel {
namespace routing {
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
namespace routing {
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
@@
-44,7
+45,7
@@
class RoutingPlatf;
class NetCard {
public:
virtual ~NetCard(){};
class NetCard {
public:
virtual ~NetCard(){};
- virtual int id()=0; // Our rank in the vertices_ array of our containing AS.
+ virtual
unsigned
int id()=0; // Our rank in the vertices_ array of our containing AS.
virtual char *name()=0;
virtual AsImpl *containingAS()=0; // This is the AS in which I am
virtual bool isAS()=0;
virtual char *name()=0;
virtual AsImpl *containingAS()=0; // This is the AS in which I am
virtual bool isAS()=0;
@@
-64,11
+65,11
@@
public:
{
if (containingAS != nullptr)
id_ = containingAS->addComponent(this);
{
if (containingAS != nullptr)
id_ = containingAS->addComponent(this);
- simgrid::routing::netcardCreatedCallbacks(this);
+ simgrid::
kernel::
routing::netcardCreatedCallbacks(this);
}
~NetCardImpl() { xbt_free(name_);};
}
~NetCardImpl() { xbt_free(name_);};
-
int id()
override {return id_;}
+
unsigned int id()
override {return id_;}
char *name() override {return name_;}
AsImpl *containingAS() override {return containingAS_;}
char *name() override {return name_;}
AsImpl *containingAS() override {return containingAS_;}
@@
-77,7
+78,7
@@
public:
bool isRouter() override {return componentType_ == Type::Router;}
private:
bool isRouter() override {return componentType_ == Type::Router;}
private:
-
int id_ = -1
;
+
unsigned int id_
;
char *name_;
NetCard::Type componentType_;
AsImpl *containingAS_;
char *name_;
NetCard::Type componentType_;
AsImpl *containingAS_;
@@
-92,7
+93,7
@@
public:
: src_(src), dst_(dst), link_(link) {};
NetCard *src_;
NetCard *dst_;
: src_(src), dst_(dst), link_(link) {};
NetCard *src_;
NetCard *dst_;
- void *link_;
+ void *link_;
// FIXME: void* should die just like the death*
};
/** @ingroup SURF_routing_interface
};
/** @ingroup SURF_routing_interface
@@
-104,11
+105,10
@@
public:
~RoutingPlatf();
AsImpl *root_ = nullptr;
Link *loopback_;
~RoutingPlatf();
AsImpl *root_ = nullptr;
Link *loopback_;
- xbt_dynar_t getOneLinkRoutes(
void
);
+ xbt_dynar_t getOneLinkRoutes();
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_ */