A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
API improvement in s4u
[simgrid.git]
/
src
/
s4u
/
s4u_netzone.cpp
diff --git
a/src/s4u/s4u_netzone.cpp
b/src/s4u/s4u_netzone.cpp
index
ea2f37c
..
f539136
100644
(file)
--- a/
src/s4u/s4u_netzone.cpp
+++ b/
src/s4u/s4u_netzone.cpp
@@
-1,12
+1,12
@@
-/* Copyright (c) 2006-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
7
. 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"
/* 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/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
#include "simgrid/simix.hpp"
#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
@@
-23,26
+23,25
@@
simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kern
NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
{
NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
{
+ children_ = new std::vector<NetZone*>();
}
}
+
void NetZone::seal()
{
sealed_ = true;
}
void NetZone::seal()
{
sealed_ = true;
}
+
NetZone::~NetZone()
{
NetZone::~NetZone()
{
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- NetZone_t 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_);
}
xbt_free(name_);
}
+
std::unordered_map<std::string, std::string>* NetZone::properties()
{
std::unordered_map<std::string, std::string>* NetZone::properties()
{
- return simgrid::simix::kernelImmediate([
=
] {
+ return simgrid::simix::kernelImmediate([
this
] {
return &properties_;
});
}
return &properties_;
});
}
@@
-54,12
+53,12
@@
const char* NetZone::property(const char* key)
}
void NetZone::setProperty(const char* key, const char* value)
{
}
void NetZone::setProperty(const char* key, const char* value)
{
- simgrid::simix::kernelImmediate([
=,&key,&
value] {
+ simgrid::simix::kernelImmediate([
this,key,
value] {
properties_[key] = value;
});
}
properties_[key] = value;
});
}
-
xbt_dict_t
NetZone::children()
+
std::vector<NetZone*>*
NetZone::children()
{
return children_;
}
{
return children_;
}
@@
-72,16
+71,13
@@
NetZone* NetZone::father()
return father_;
}
return father_;
}
-
xbt_dynar_t NetZone::hosts(
)
+
void NetZone::hosts(std::vector<s4u::Host*>* whereto
)
{
{
- 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)
for (auto card : vertices_) {
s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
if (host != nullptr)
-
xbt_dynar_push(res, &
host);
+
whereto->push_back(
host);
}
}
- return res;
}
int NetZone::addComponent(kernel::routing::NetPoint* elm)
}
int NetZone::addComponent(kernel::routing::NetPoint* elm)