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
Cosmetics.
[simgrid.git]
/
src
/
s4u
/
s4u_netzone.cpp
diff --git
a/src/s4u/s4u_netzone.cpp
b/src/s4u/s4u_netzone.cpp
index
e2149e6
..
0dc3a43
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
@@
-20,27
+20,27
@@
simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kern
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
std::vector<surf::LinkImpl*>* link_list)>
NetZone::onRouteCreation;
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)
)
+NetZone::NetZone(NetZone* father,
std::string name) : father_(father), name_(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* elem;
- xbt_dict_foreach (children_, cursor, key, elem) {
- delete static_cast<NetZone*>(elem);
- }
-
- xbt_dict_free(&children_);
- xbt_free(name_);
+ for (auto const& nz : *children_)
+ delete nz;
+ delete children_;
}
}
-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_;
{
return simgrid::simix::kernelImmediate([this] {
return &properties_;
@@
-48,7
+48,7
@@
std::unordered_map<std::string, std::string>* NetZone::properties()
}
/** Retrieve the property value (or nullptr if not set) */
}
/** Retrieve the property value (or nullptr if not set) */
-const char* NetZone::
p
roperty(const char* key)
+const char* NetZone::
getP
roperty(const char* key)
{
return properties_.at(key).c_str();
}
{
return properties_.at(key).c_str();
}
@@
-59,29
+59,26
@@
void NetZone::setProperty(const char* key, const char* value)
});
}
});
}
-
xbt_dict_t NetZone::c
hildren()
+
std::vector<NetZone*>* NetZone::getC
hildren()
{
return children_;
}
{
return children_;
}
-c
har* NetZone::
name()
+c
onst char* NetZone::getC
name()
{
{
- return name_;
+ return name_
.c_str()
;
}
}
-NetZone* NetZone::
f
ather()
+NetZone* NetZone::
getF
ather()
{
return father_;
}
{
return father_;
}
-
xbt_dynar_t NetZone::hosts(
)
+
void NetZone::getHosts(std::vector<s4u::Host*>* whereto
)
{
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
-
- for (auto card : vertices_) {
+ for (auto const& card : vertices_) {
s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
if (host != nullptr)
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)
@@
-92,7
+89,7
@@
int NetZone::addComponent(kernel::routing::NetPoint* elm)
void NetZone::addRoute(sg_platf_route_cbarg_t /*route*/)
{
void NetZone::addRoute(sg_platf_route_cbarg_t /*route*/)
{
- xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_);
+ xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_
.c_str()
);
}
}
}; // namespace simgrid::s4u
}
}
}; // namespace simgrid::s4u