#include "simgrid/s4u/NetZone.hpp"
#include "simgrid/s4u/host.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "simgrid/simix.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
-#include "src/surf/surf_routing.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
namespace simgrid {
namespace s4u {
-simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetCard* src, kernel::routing::NetCard* dst,
- kernel::routing::NetCard* gw_src, kernel::routing::NetCard* gw_dst,
- std::vector<Link*>* link_list)>
+simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+ kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+ std::vector<surf::LinkImpl*>* link_list)>
NetZone::onRouteCreation;
NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
{
+ children_ = new std::vector<NetZone*>();
}
+
void NetZone::seal()
{
sealed_ = true;
}
+
NetZone::~NetZone()
{
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- NetZone_t elem;
- xbt_dict_foreach (children_, cursor, key, elem) {
- delete (NetZone*)elem;
- }
-
- xbt_dict_free(&children_);
+ for (auto nz : *children_)
+ delete nz;
+ delete children_;
xbt_free(name_);
}
-xbt_dict_t NetZone::children()
+std::unordered_map<std::string, std::string>* NetZone::properties()
+{
+ return simgrid::simix::kernelImmediate([this] {
+ return &properties_;
+ });
+}
+
+/** Retrieve the property value (or nullptr if not set) */
+const char* NetZone::property(const char* key)
+{
+ return properties_.at(key).c_str();
+}
+void NetZone::setProperty(const char* key, const char* value)
+{
+ simgrid::simix::kernelImmediate([this,key,value] {
+ properties_[key] = value;
+ });
+}
+
+std::vector<NetZone*>* NetZone::children()
{
return children_;
}
return father_;
}
-xbt_dynar_t NetZone::hosts()
+std::vector<s4u::Host*>* NetZone::hosts()
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
-
- for (auto card : vertices_) {
- s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
- if (host != nullptr)
- xbt_dynar_push(res, &host);
- }
- return res;
+ if (hosts_.empty()) // Lazy initialization
+ for (auto card : vertices_) {
+ s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
+ if (host != nullptr)
+ hosts_.push_back(host);
+ }
+ return &hosts_;
}
-int NetZone::addComponent(kernel::routing::NetCard* elm)
+int NetZone::addComponent(kernel::routing::NetPoint* elm)
{
vertices_.push_back(elm);
return vertices_.size() - 1; // The rank of the newly created object