X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1b3e440de2150420b08c0bc55a125a0c9eb86bc..9e66dd72aafe17f731081ba7023875fef091a249:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 7bc177c4eb..14c49d9372 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -1,11 +1,16 @@ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2020. 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 "simgrid/Exception.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "src/instr/instr_private.hpp" +#include +#ifdef WIN32 +#include // _mkdir +#endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)"); @@ -15,8 +20,6 @@ double prefix = 0.0; // TI specific static container_t rootContainer = nullptr; /* the root container */ static std::map allContainers; /* all created containers indexed by name */ -std::set trivaNodeTypes; /* all host types defined */ -std::set trivaEdgeTypes; /* all link types defined */ long long int instr_new_paje_id () { @@ -32,8 +35,8 @@ container_t Container::get_root() return rootContainer; } -NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father) - : Container::Container(std::move(name), "", father) +NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father) + : Container::Container(name, "", father) { netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()); xbt_assert(netpoint_, "Element '%s' not found", get_cname()); @@ -48,37 +51,33 @@ NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZone } } -RouterContainer::RouterContainer(std::string name, Container* father) - : Container::Container(std::move(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"); 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) - : Container::Container(host.get_cname(), "HOST", father) +HostContainer::HostContainer(simgrid::s4u::Host const& host, NetZoneContainer* father) + : Container::Container(host.get_name(), "HOST", father) { xbt_assert(father, "Only the Root container has no father"); - netpoint_ = host.pimpl_netpoint; + netpoint_ = host.get_netpoint(); xbt_assert(netpoint_, "Element '%s' not found", host.get_cname()); - - trivaNodeTypes.insert(type_->get_name()); } -Container::Container(std::string name, std::string type_name, Container* father) - : name_(std::move(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_) { - 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(type_name); @@ -89,18 +88,16 @@ Container::Container(std::string name, std::string type_name, Container* father) //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()); + throw simgrid::TracingError( + XBT_THROW_POINT, + simgrid::xbt::string_printf("container %s already present in allContainers data structure", get_cname())); - XBT_DEBUG("Add container name '%s'", name_.c_str()); - - //register NODE types for triva configuration - if (type_name == "LINK") - trivaNodeTypes.insert(type_->get_name()); + XBT_DEBUG("Add container name '%s'", get_cname()); } 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; @@ -117,18 +114,18 @@ Container::~Container() 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(std::move(name), std::move(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; } -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()); @@ -213,25 +210,25 @@ void Container::log_destruction() } } -StateType* Container::get_state(std::string name) +StateType* Container::get_state(const std::string& name) { - StateType* ret = dynamic_cast(type_->by_name(name)); + StateType* ret = static_cast(type_->by_name(name)); ret->set_calling_container(this); return ret; } -LinkType* Container::get_link(std::string name) +LinkType* Container::get_link(const std::string& name) { - LinkType* ret = dynamic_cast(type_->by_name(name)); + LinkType* ret = static_cast(type_->by_name(name)); ret->set_calling_container(this); return ret; } -VariableType* Container::get_variable(std::string name) +VariableType* Container::get_variable(const std::string& name) { - VariableType* ret = dynamic_cast(type_->by_name(name)); + VariableType* ret = static_cast(type_->by_name(name)); ret->set_calling_container(this); return ret; } -} -} +} // namespace instr +} // namespace simgrid