#include "surf_interface.hpp"
#include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML.
-#include <float.h>
+#include "src/kernel/routing/AsImpl.hpp"
+#include <float.h>
#include <vector>
-#include <map>
SG_BEGIN_DECL()
XBT_PUBLIC(void) routing_model_create(Link *loopback);
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;
/***********
* Classes *
***********/
-class XBT_PRIVATE RoutingModelDescription;
class XBT_PRIVATE Onelink;
class RoutingPlatf;
*/
class NetCard {
public:
- virtual ~NetCard(){};
- virtual int id()=0; // Our rank in the vertices_ array of our containing AS.
- virtual void setId(int id)=0;
- virtual char *name()=0;
- virtual s4u::As *containingAS()=0; // This is the AS in which I am
+ virtual ~NetCard() = default;
+ virtual unsigned int id()=0; // Our rank in the vertices_ array of our containing AS.
+ virtual std::string name() = 0;
+ virtual AsImpl *containingAS()=0; // This is the AS in which I am
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:
- NetCardImpl(const char *name, e_surf_network_element_type_t componentType, s4u::As *as)
- : name_(xbt_strdup(name)),
- componentType_(componentType),
- containingAS_(as)
- {}
- ~NetCardImpl() { xbt_free(name_);};
-
- int id() override {return id_;}
- void setId(int id) override {id_ = id;}
- char *name() override {return name_;}
- s4u::As *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;}
+ NetCardImpl(std::string name, NetCard::Type componentType, AsImpl* containingAS)
+ : name_(name), componentType_(componentType), containingAS_(containingAS)
+ {
+ if (containingAS != nullptr)
+ id_ = containingAS->addComponent(this);
+ simgrid::kernel::routing::netcardCreatedCallbacks(this);
+ }
+ ~NetCardImpl() = default;
+
+ unsigned int id() override {return id_;}
+ std::string name() override { return name_; }
+ AsImpl *containingAS() override {return containingAS_;}
+
+ 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_;
- e_surf_network_element_type_t componentType_;
- s4u::As *containingAS_;
+ unsigned int id_;
+ std::string name_;
+ NetCard::Type componentType_;
+ AsImpl *containingAS_;
};
/** @ingroup SURF_routing_interface
: 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
*/
XBT_PUBLIC_CLASS RoutingPlatf {
public:
- RoutingPlatf(Link *loopback);
+ explicit RoutingPlatf(Link *loopback);
~RoutingPlatf();
- s4u::As *root_ = nullptr;
+ 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);
};
-/*************
- * Callbacks *
- *************/
-
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) netcardCreatedCallbacks;
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
-
-}
-}
+}}}
#endif /* NETWORK_ROUTING_HPP_ */