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
cosmetics in AsCluster and friends
[simgrid.git]
/
src
/
surf
/
surf_routing.hpp
diff --git
a/src/surf/surf_routing.hpp
b/src/surf/surf_routing.hpp
index
ccbb7d6
..
e404638
100644
(file)
--- a/
src/surf/surf_routing.hpp
+++ b/
src/surf/surf_routing.hpp
@@
-16,7
+16,6
@@
#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);
@@
-51,11
+50,14
@@
public:
virtual bool isAS()=0;
virtual bool isHost()=0;
virtual bool isRouter()=0;
virtual bool isAS()=0;
virtual bool isHost()=0;
virtual bool isRouter()=0;
+ enum class Type {
+ Host, Router, As
+ };
};
struct XBT_PRIVATE NetCardImpl : public NetCard {
public:
};
struct XBT_PRIVATE NetCardImpl : public NetCard {
public:
- NetCardImpl(const char *name,
e_surf_network_element_type_t
componentType, AsImpl *containingAS)
+ NetCardImpl(const char *name,
NetCard::Type
componentType, AsImpl *containingAS)
: name_(xbt_strdup(name)),
componentType_(componentType),
containingAS_(containingAS)
: name_(xbt_strdup(name)),
componentType_(componentType),
containingAS_(containingAS)
@@
-70,14
+72,14
@@
public:
char *name() override {return name_;}
AsImpl *containingAS() override {return containingAS_;}
char *name() override {return name_;}
AsImpl *containingAS() override {return containingAS_;}
- bool isAS() override {return componentType_ ==
SURF_NETWORK_ELEMENT_AS
;}
- bool isHost() override {return componentType_ ==
SURF_NETWORK_ELEMENT_HOST
;}
- bool isRouter() override {return componentType_ ==
SURF_NETWORK_ELEMENT_ROUTER
;}
+ bool isAS() override {return componentType_ ==
Type::As
;}
+ bool isHost() override {return componentType_ ==
Type::Host
;}
+ bool isRouter() override {return componentType_ ==
Type::Router
;}
private:
int id_ = -1;
char *name_;
private:
int id_ = -1;
char *name_;
-
e_surf_network_element_type_t
componentType_;
+
NetCard::Type
componentType_;
AsImpl *containingAS_;
};
AsImpl *containingAS_;
};
@@
-98,7
+100,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_;