-/* Copyright (c) 2006-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/log.h"
+#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/s4u/host.hpp"
#include "simgrid/simix.hpp"
#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
std::vector<surf::LinkImpl*>* link_list)>
NetZone::onRouteCreation;
+simgrid::xbt::signal<void(NetZone&)> NetZone::onCreation;
+simgrid::xbt::signal<void(NetZone&)> NetZone::onSeal;
NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
{
- for (auto card : vertices_) {
- s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
- if (host != nullptr)
- hosts_->push_back(host);
- }
+ children_ = new std::vector<NetZone*>();
}
void NetZone::seal()
{
sealed_ = true;
}
+
NetZone::~NetZone()
{
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- NetZone* elem;
- xbt_dict_foreach (children_, cursor, key, elem) {
- delete static_cast<NetZone*>(elem);
- }
-
- xbt_dict_free(&children_);
+ for (auto nz : *children_)
+ delete nz;
+ delete children_;
xbt_free(name_);
}
-std::unordered_map<std::string, std::string>* NetZone::properties()
+
+std::unordered_map<std::string, std::string>* NetZone::getProperties()
{
return simgrid::simix::kernelImmediate([this] {
return &properties_;
}
/** Retrieve the property value (or nullptr if not set) */
-const char* NetZone::property(const char* key)
+const char* NetZone::getProperty(const char* key)
{
return properties_.at(key).c_str();
}
});
}
-xbt_dict_t NetZone::children()
+std::vector<NetZone*>* NetZone::getChildren()
{
return children_;
}
-char* NetZone::name()
+char* NetZone::getCname()
{
return name_;
}
-NetZone* NetZone::father()
+NetZone* NetZone::getFather()
{
return father_;
}
-std::vector<s4u::Host*>* NetZone::hosts()
+void NetZone::getHosts(std::vector<s4u::Host*>* whereto)
{
- return hosts_;
+ for (auto card : vertices_) {
+ s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
+ if (host != nullptr)
+ whereto->push_back(host);
+ }
}
int NetZone::addComponent(kernel::routing::NetPoint* elm)