X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ce054415500e2f9b7ebf726c9f22446f5ec39f3..HEAD:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 76b985257e..5ebe79a08a 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -1,224 +1,138 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2023. 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 */ +namespace simgrid::instr { -long long int instr_new_paje_id () +Container* Container::root_container_ = nullptr; /* the root container */ +std::map> Container::all_containers_; /* all created containers indexed by name */ + +NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* parent) + : Container::Container(name, "", parent) { - static long long int type_id = 0; - return type_id++; + xbt_assert(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Element '%s' not found", get_cname()); + if (parent_) { + std::string type_name = "L" + std::to_string(level); + type_ = parent_->type_->by_name_or_create(type_name); + parent_->children_.try_emplace(get_name(), this); + on_creation(*this); + } else { + type_ = new ContainerType("0"); + set_root(this); + } } -void PJ_container_set_root (container_t root) +RouterContainer::RouterContainer(const std::string& name, Container* parent) + : Container::Container(name, "ROUTER", parent) { - rootContainer = root; + xbt_assert(parent, "Only the Root container has no parent"); + xbt_assert(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Element '%s' not found", get_cname()); } -simgrid::instr::Container::Container(const char* name, simgrid::instr::e_container_types kind, Container* father) - : name_(xbt_strdup(name)), father_(father) +HostContainer::HostContainer(s4u::Host const& host, NetZoneContainer* parent) + : Container::Container(host.get_name(), "HOST", parent) { - xbt_assert(name != nullptr, "Container name cannot be nullptr"); + xbt_assert(parent, "Only the Root container has no parent"); + xbt_assert(host.get_netpoint(), "Element '%s' not found", host.get_cname()); +} +Container::Container(const std::string& name, const std::string& type_name, Container* parent) + : name_(name), parent_(parent) +{ static long long int container_id = 0; - id_ = bprintf("%lld", 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)->pimpl_netpoint; - xbt_assert(this->netpoint_, "Element '%s' not found", name); - break; - case simgrid::instr::INSTR_ROUTER: - this->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); - xbt_assert(this->netpoint_, "Element '%s' not found", name); - break; - case simgrid::instr::INSTR_AS: - this->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); - xbt_assert(this->netpoint_, "Element '%s' not found", name); - break; - default: - this->netpoint_ = nullptr; - break; - } + if (parent_) { + XBT_DEBUG("new container %s, child of %s", get_cname(), parent->get_cname()); - if (father_) { - this->level_ = father_->level_ + 1; - XBT_DEBUG("new container %s, child of %s", name, father->name_); - } - - // type definition (method depends on kind of this new container) - this->kind_ = kind; - 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_ = simgrid::instr::Type::getOrNull(as_typename, this->father_->type_); - 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; + if (not type_name.empty()) { + type_ = parent_->type_->by_name_or_create(type_name); + parent_->children_.try_emplace(name_, this); + on_creation(*this); } - simgrid::instr::Type* type = simgrid::instr::Type::getOrNull(typeNameBuff, this->father_->type_); - if (type == nullptr){ - this->type_ = simgrid::instr::Type::containerNew(typeNameBuff, this->father_->type_); - }else{ - this->type_ = type; - } - } - this->children_ = xbt_dict_new_homogeneous(nullptr); - if (this->father_) { - xbt_dict_set(this->father_->children_, this->name_, this, nullptr); - LogContainerCreation(this); } //register all kinds by name - if (allContainers.find(this->name_) != allContainers.end()) { - THROWF(tracing_error, 1, "container %s already present in allContainers data structure", this->name_); - } - - allContainers.emplace(this->name_, this); - XBT_DEBUG("Add container name '%s'", this->name_); + if (not all_containers_.try_emplace(name_, this).second) + throw TracingError(XBT_THROW_POINT, + xbt::string_printf("container %s already present in all_containers_", 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() + +Container::~Container() { - XBT_DEBUG("destroy container %s", name_); - - // 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); - } + XBT_DEBUG("destroy container %s", get_cname()); + // Begin with destroying my own children + for (auto const& [_, child] : children_) + delete child; + + // remove me from the all_containers_ data structure + all_containers_.erase(name_); - // remove it from allContainers data structure - allContainers.erase(name_); + // obligation to dump previous events because they might reference the container that is about to be destroyed + last_timestamp_to_dump = simgrid_get_clock(); + dump_buffer(true); - // free - xbt_free(name_); - xbt_free(id_); - xbt_dict_free(&children_); + 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) { - if (allContainers.find(name) == allContainers.end()) - return nullptr; - return allContainers.at(name); + auto cont = all_containers_.find(name); + return cont == all_containers_.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"); + if (parent_) { + XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get_cname(), parent_->get_cname()); + parent_->children_.erase(name_); } + delete this; +} - container_t parent = child->father_; - if (parent){ - XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", child->name_, parent->name_); - xbt_dict_remove(parent->children_, child->name_); - } +StateType* Container::get_state(const std::string& name) +{ + return static_cast(type_->by_name(name)->set_calling_container(this)); } -static void recursiveDestroyContainer (container_t container) +LinkType* Container::get_link(const std::string& name) { - if (container == nullptr){ - THROWF (tracing_error, 0, "trying to recursively destroy a nullptr container"); - } - XBT_DEBUG("recursiveDestroyContainer %s", container->name_); - xbt_dict_cursor_t cursor = nullptr; - container_t child; - char *child_name; - xbt_dict_foreach (container->children_, cursor, child_name, child) { - recursiveDestroyContainer (child); - } - delete container; + return static_cast(type_->by_name(name)->set_calling_container(this)); } -void PJ_container_free_all () +VariableType* Container::get_variable(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"); - } +EntityValue::EntityValue(const std::string& name, const std::string& color, Type* parent) + : name_(name), color_(color), parent_(parent) +{ + on_creation(*this); } + +} // namespace simgrid::instr