-/* 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
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* 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()
{
return simgrid::simix::kernelImmediate([this] {
});
}
-xbt_dict_t NetZone::children()
+std::vector<NetZone*>* NetZone::children()
{
return children_;
}
return father_;
}
-std::vector<s4u::Host*> NetZone::hosts()
+void NetZone::hosts(std::vector<s4u::Host*>* whereto)
{
- std::vector<s4u::Host*> res;
-
for (auto card : vertices_) {
s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
if (host != nullptr)
- res.push_back(host);
+ whereto->push_back(host);
}
- return res;
}
int NetZone::addComponent(kernel::routing::NetPoint* elm)