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
Python: Add Comm.wait_any
[simgrid.git]
/
src
/
instr
/
instr_paje_containers.cpp
diff --git
a/src/instr/instr_paje_containers.cpp
b/src/instr/instr_paje_containers.cpp
index
68fc0ce
..
49271aa
100644
(file)
--- a/
src/instr/instr_paje_containers.cpp
+++ b/
src/instr/instr_paje_containers.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
9
. 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. */
/* 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. */
@@
-32,11
+32,11
@@
container_t Container::get_root()
return rootContainer;
}
return rootContainer;
}
-NetZoneContainer::NetZoneContainer(
std::string
name, unsigned int level, NetZoneContainer* father)
+NetZoneContainer::NetZoneContainer(
const std::string&
name, unsigned int level, NetZoneContainer* father)
: Container::Container(name, "", father)
{
: Container::Container(name, "", father)
{
- netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(
name
);
- xbt_assert(netpoint_, "Element '%s' not found",
name.c_str
());
+ netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(
get_name()
);
+ xbt_assert(netpoint_, "Element '%s' not found",
get_cname
());
if (father_) {
std::string type_name = std::string("L") + std::to_string(level);
type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
if (father_) {
std::string type_name = std::string("L") + std::to_string(level);
type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
@@
-48,18
+48,19
@@
NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZone
}
}
}
}
-RouterContainer::RouterContainer(std::string name, Container* father) : Container::Container(name, "ROUTER", father)
+RouterContainer::RouterContainer(const std::string& name, Container* father)
+ : Container::Container(name, "ROUTER", father)
{
xbt_assert(father, "Only the Root container has no father");
{
xbt_assert(father, "Only the Root container has no father");
- netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(
name
);
- xbt_assert(netpoint_, "Element '%s' not found",
name.c_str
());
+ netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(
get_name()
);
+ xbt_assert(netpoint_, "Element '%s' not found",
get_cname
());
trivaNodeTypes.insert(type_->get_name());
}
HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
trivaNodeTypes.insert(type_->get_name());
}
HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
- : Container::Container(host.get_
c
name(), "HOST", father)
+ : Container::Container(host.get_name(), "HOST", father)
{
xbt_assert(father, "Only the Root container has no father");
{
xbt_assert(father, "Only the Root container has no father");
@@
-69,14
+70,15
@@
HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
trivaNodeTypes.insert(type_->get_name());
}
trivaNodeTypes.insert(type_->get_name());
}
-Container::Container(std::string name, std::string type_name, Container* father) : name_(name), father_(father)
+Container::Container(const std::string& name, const std::string& type_name, Container* father)
+ : name_(name), father_(father)
{
static long long int container_id = 0;
id_ = container_id; // id (or alias) of the container
container_id++;
if (father_) {
{
static long long int container_id = 0;
id_ = container_id; // id (or alias) of the container
container_id++;
if (father_) {
- XBT_DEBUG("new container %s, child of %s",
name.c_str(), father->name_.c_str
());
+ XBT_DEBUG("new container %s, child of %s",
get_cname(), father->get_cname
());
if (not type_name.empty()) {
type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
if (not type_name.empty()) {
type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
@@
-87,9
+89,9
@@
Container::Container(std::string name, std::string type_name, Container* father)
//register all kinds by name
if (not allContainers.emplace(name_, this).second)
//register all kinds by name
if (not allContainers.emplace(name_, this).second)
- THROWF(tracing_error, 1, "container %s already present in allContainers data structure",
name_.c_str
());
+ THROWF(tracing_error, 1, "container %s already present in allContainers data structure",
get_cname
());
- XBT_DEBUG("Add container name '%s'",
name_.c_str
());
+ XBT_DEBUG("Add container name '%s'",
get_cname
());
//register NODE types for triva configuration
if (type_name == "LINK")
//register NODE types for triva configuration
if (type_name == "LINK")
@@
-98,7
+100,7
@@
Container::Container(std::string name, std::string type_name, Container* father)
Container::~Container()
{
Container::~Container()
{
- XBT_DEBUG("destroy container %s",
name_.c_str
());
+ XBT_DEBUG("destroy container %s",
get_cname
());
// Begin with destroying my own children
for (auto child : children_)
delete child.second;
// Begin with destroying my own children
for (auto child : children_)
delete child.second;
@@
-115,18
+117,18
@@
Container::~Container()
allContainers.erase(name_);
}
allContainers.erase(name_);
}
-void Container::create_child(
std::string name, std::string
type_name)
+void Container::create_child(
const std::string& name, const std::string&
type_name)
{
new Container(name, type_name, this);
}
{
new Container(name, type_name, this);
}
-Container* Container::by_name_or_null(
std::string
name)
+Container* Container::by_name_or_null(
const std::string&
name)
{
auto cont = allContainers.find(name);
return cont == allContainers.end() ? nullptr : cont->second;
}
{
auto cont = allContainers.find(name);
return cont == allContainers.end() ? nullptr : cont->second;
}
-Container* Container::by_name(
std::string
name)
+Container* Container::by_name(
const std::string&
name)
{
Container* ret = Container::by_name_or_null(name);
xbt_assert(ret != nullptr, "container with name %s not found", name.c_str());
{
Container* ret = Container::by_name_or_null(name);
xbt_assert(ret != nullptr, "container with name %s not found", name.c_str());
@@
-211,23
+213,23
@@
void Container::log_destruction()
}
}
}
}
-StateType* Container::get_state(
std::string
name)
+StateType* Container::get_state(
const std::string&
name)
{
{
- StateType* ret =
dynam
ic_cast<StateType*>(type_->by_name(name));
+ StateType* ret =
stat
ic_cast<StateType*>(type_->by_name(name));
ret->set_calling_container(this);
return ret;
}
ret->set_calling_container(this);
return ret;
}
-LinkType* Container::get_link(
std::string
name)
+LinkType* Container::get_link(
const std::string&
name)
{
{
- LinkType* ret =
dynam
ic_cast<LinkType*>(type_->by_name(name));
+ LinkType* ret =
stat
ic_cast<LinkType*>(type_->by_name(name));
ret->set_calling_container(this);
return ret;
}
ret->set_calling_container(this);
return ret;
}
-VariableType* Container::get_variable(
std::string
name)
+VariableType* Container::get_variable(
const std::string&
name)
{
{
- VariableType* ret =
dynam
ic_cast<VariableType*>(type_->by_name(name));
+ VariableType* ret =
stat
ic_cast<VariableType*>(type_->by_name(name));
ret->set_calling_container(this);
return ret;
}
ret->set_calling_container(this);
return ret;
}