X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98bd9e6807124982d6a9c1a189a89cf8f3664227..9a35e3d4e5aed80e7b3fab624547ab045dc00f8a:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 32966ff879..0680d8c9d3 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -1,24 +1,17 @@ -/* Copyright (c) 2010-2017. 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 "surf/surf.h" - -#include "src/instr/instr_private.h" - -#include +#include "src/instr/instr_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)"); static container_t rootContainer = nullptr; /* the root container */ -static std::unordered_map - allContainers; /* all created containers indexed by name */ -std::set trivaNodeTypes; /* all host types defined */ -std::set trivaEdgeTypes; /* all link types defined */ +static std::map allContainers; /* all created containers indexed by name */ long long int instr_new_paje_id () { @@ -26,186 +19,122 @@ long long int instr_new_paje_id () return type_id++; } -void PJ_container_set_root (container_t root) +namespace simgrid { +namespace instr { + +Container* Container::get_root() +{ + return rootContainer; +} + +NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father) + : Container::Container(name, "", father) { - rootContainer = root; + xbt_assert(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "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(type_name); + father_->children_.insert({get_name(), this}); + on_creation(*this); + } else { + type_ = new ContainerType("0"); + rootContainer = this; + } } -simgrid::instr::Container::Container(std::string name, simgrid::instr::e_container_types kind, Container* father) - : name_(name), kind_(kind), father_(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(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Element '%s' not found", get_cname()); +} + +HostContainer::HostContainer(s4u::Host const& host, NetZoneContainer* father) + : Container::Container(host.get_name(), "HOST", father) +{ + xbt_assert(father, "Only the Root container has no father"); + xbt_assert(host.get_netpoint(), "Element '%s' not found", host.get_cname()); +} + +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_ = std::to_string(container_id); // id (or alias) of the container + id_ = container_id; // id (or alias) of the container container_id++; - //Search for network_element_t - switch (kind){ - case simgrid::instr::INSTR_HOST: - this->netpoint_ = sg_host_by_name(name.c_str())->pimpl_netpoint; - xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str()); - break; - case simgrid::instr::INSTR_ROUTER: - this->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); - xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str()); - break; - case simgrid::instr::INSTR_AS: - this->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); - xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str()); - break; - default: - this->netpoint_ = nullptr; - break; - } - if (father_) { - this->level_ = father_->level_ + 1; - 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()); - // type definition (method depends on kind of this new container) - if (this->kind_ == simgrid::instr::INSTR_AS) { - //if this container is of an AS, its type name depends on its level - char as_typename[INSTR_DEFAULT_STR_SIZE]; - snprintf(as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", this->level_); - if (this->father_) { - this->type_ = this->father_->type_->getChildOrNull(as_typename); - if (this->type_ == nullptr) { - this->type_ = simgrid::instr::Type::containerNew(as_typename, this->father_->type_); - } - }else{ - this->type_ = simgrid::instr::Type::containerNew("0", nullptr); - } - } else { - //otherwise, the name is its kind - char typeNameBuff[INSTR_DEFAULT_STR_SIZE]; - switch (this->kind_) { - case simgrid::instr::INSTR_HOST: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "HOST"); - break; - case simgrid::instr::INSTR_LINK: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "LINK"); - break; - case simgrid::instr::INSTR_ROUTER: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "ROUTER"); - break; - case simgrid::instr::INSTR_SMPI: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MPI"); - break; - case simgrid::instr::INSTR_MSG_PROCESS: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_PROCESS"); - break; - case simgrid::instr::INSTR_MSG_VM: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_VM"); - break; - case simgrid::instr::INSTR_MSG_TASK: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_TASK"); - break; - default: - THROWF (tracing_error, 0, "new container kind is unknown."); - break; - } - simgrid::instr::Type* type = this->father_->type_->getChildOrNull(typeNameBuff); - if (type == nullptr){ - this->type_ = simgrid::instr::Type::containerNew(typeNameBuff, this->father_->type_); - }else{ - this->type_ = type; + if (not type_name.empty()) { + type_ = father_->type_->by_name_or_create(type_name); + father_->children_.insert({name_, this}); + on_creation(*this); } } - if (this->father_) { - this->father_->children_.insert({this->name_, this}); - LogContainerCreation(this); - } //register all kinds by name - if (not allContainers.emplace(this->name_, this).second) { - THROWF(tracing_error, 1, "container %s already present in allContainers data structure", this->name_.c_str()); - } - - XBT_DEBUG("Add container name '%s'", this->name_.c_str()); + if (not allContainers.emplace(name_, this).second) + throw TracingError(XBT_THROW_POINT, + xbt::string_printf("container %s already present in allContainers data structure", get_cname())); - //register NODE types for triva configuration - if (this->kind_ == simgrid::instr::INSTR_HOST || this->kind_ == simgrid::instr::INSTR_LINK || - this->kind_ == simgrid::instr::INSTR_ROUTER) { - trivaNodeTypes.insert(this->type_->name_); - } + XBT_DEBUG("Add container name '%s'", get_cname()); } -simgrid::instr::Container::~Container() -{ - XBT_DEBUG("destroy container %s", name_.c_str()); - - // obligation to dump previous events because they might - // reference the container that is about to be destroyed - TRACE_last_timestamp_to_dump = surf_get_clock(); - TRACE_paje_dump_buffer(1); - // trace my destruction - if (not TRACE_disable_destroy() && this != PJ_container_get_root()) { - // do not trace the container destruction if user requests or if the container is root - LogContainerDestruction(this); - } +Container::~Container() +{ + XBT_DEBUG("destroy container %s", get_cname()); + // Begin with destroying my own children + for (auto child : children_) + delete child.second; - // remove it from allContainers data structure + // remove me from the allContainers data structure allContainers.erase(name_); - // free + on_destruction(*this); } -simgrid::instr::Container* PJ_container_get(const char* name) +void Container::create_child(const std::string& name, const std::string& type_name) { - container_t ret = PJ_container_get_or_null (name); - if (ret == nullptr){ - THROWF(tracing_error, 1, "container with name %s not found", name); - } - return ret; + new Container(name, type_name, this); } -simgrid::instr::Container* PJ_container_get_or_null(const char* name) +Container* Container::by_name_or_null(const std::string& name) { auto cont = allContainers.find(name); return cont == allContainers.end() ? nullptr : cont->second; } -simgrid::instr::Container* PJ_container_get_root() +Container* Container::by_name(const std::string& name) { - return rootContainer; + Container* ret = Container::by_name_or_null(name); + xbt_assert(ret != nullptr, "container with name %s not found", name.c_str()); + + return ret; } -void PJ_container_remove_from_parent (container_t child) +void Container::remove_from_parent() { - if (child == nullptr){ - THROWF (tracing_error, 0, "can't remove from parent with a nullptr child"); - } - - container_t parent = child->father_; - if (parent){ - XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", child->name_.c_str(), parent->name_.c_str()); - parent->children_.erase(child->name_); + if (father_) { + XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get_cname(), father_->get_cname()); + father_->children_.erase(name_); } + delete this; } -static void recursiveDestroyContainer (container_t container) +StateType* Container::get_state(const std::string& name) { - if (container == nullptr){ - THROWF (tracing_error, 0, "trying to recursively destroy a nullptr container"); - } - XBT_DEBUG("recursiveDestroyContainer %s", container->name_.c_str()); - for (auto child : container->children_) { - recursiveDestroyContainer(child.second); - } - delete container; + return static_cast(type_->by_name(name)->set_calling_container(this)); } -void PJ_container_free_all () +LinkType* Container::get_link(const std::string& name) { - container_t root = PJ_container_get_root(); - if (root == nullptr){ - THROWF (tracing_error, 0, "trying to free all containers, but root is nullptr"); - } - recursiveDestroyContainer (root); - rootContainer = nullptr; + return static_cast(type_->by_name(name)->set_calling_container(this)); +} - //checks - if (not allContainers.empty()) { - THROWF(tracing_error, 0, "some containers still present even after destroying all of them"); - } +VariableType* Container::get_variable(const std::string& name) +{ + return static_cast(type_->by_name(name)->set_calling_container(this)); } +} // namespace instr +} // namespace simgrid