#ifndef SIMGRID_S4U_AS_HPP
#define SIMGRID_S4U_AS_HPP
-#include "xbt/base.h"
-#include "xbt/graph.h"
-
-#include "simgrid/s4u/forward.hpp"
-#include <vector>
#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <xbt/base.h>
+#include <xbt/graph.h>
+
+#include <simgrid/s4u/forward.hpp>
#include "src/surf/xml/platf_private.hpp" // FIXME: kill sg_platf_route_cbarg_t to remove that UGLY include
namespace simgrid {
namespace surf {
- class AsImpl;
class Link;
- class NetCard;
+}
+namespace kernel {
+ namespace routing {
+ class AsImpl;
+ class NetCard;
+ }
}
namespace s4u {
*/
XBT_PUBLIC_CLASS As {
protected:
- friend simgrid::surf::AsImpl;
+ friend simgrid::kernel::routing::AsImpl;
- As(const char *name);
+ explicit As(As * father, const char* name);
virtual ~As();
public:
char *name();
As *father();;
xbt_dict_t children(); // Sub AS
- xbt_dynar_t hosts(); // my content
+ xbt_dynar_t hosts(); // my content as a dynar
- As *father_ = nullptr; // FIXME: hide me
public:
/* Add content to the AS, at parsing time. It should be sealed afterward. */
- virtual int addComponent(surf::NetCard *elm); /* A host, a router or an AS, whatever */
+ virtual int addComponent(kernel::routing::NetCard *elm); /* A host, a router or an AS, whatever */
virtual void addRoute(sg_platf_route_cbarg_t route);
void addBypassRoute(sg_platf_route_cbarg_t e_route);
protected:
- char *name_ = nullptr;
- xbt_dict_t children_ = xbt_dict_new_homogeneous(NULL); // sub-ASes
- xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),NULL); // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
-
- std::map<std::pair<std::string, std::string>, std::vector<surf::Link*>*> bypassRoutes_; // srcName x dstName -> route
+ std::vector<kernel::routing::NetCard*> vertices_; // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
private:
+ As* father_ = nullptr;
+ char* name_ = nullptr;
+
bool sealed_ = false; // We cannot add more content when sealed
+
+ std::map<std::pair<std::string, std::string>, std::vector<surf::Link*>*> bypassRoutes_; // srcName x dstName -> route
+ xbt_dict_t children_ = xbt_dict_new_homogeneous(nullptr); // sub-ASes
};
}}; // Namespace simgrid::s4u
