X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f6cbb176d4301cae36a945dfa57e6b6a9cbafef..cee8b7d98f1c3b6738ad5f0b20de7bed9ba08d5a:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 31f825e466..647857d342 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -1,233 +1,140 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2022. 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 "src/instr/instr_private.h" -#include "xbt/lib.h" -#include "surf/surf.h" -#include "surf/surf_routing.h" +#include "simgrid/Exception.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" +#include "src/instr/instr_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)"); -static container_t rootContainer = NULL; /* the root container */ -static xbt_dict_t allContainers = NULL; /* all created containers indexed by name */ -xbt_dict_t trivaNodeTypes = NULL; /* all host types defined */ -xbt_dict_t trivaEdgeTypes = NULL; /* all link types defined */ +namespace simgrid { +namespace instr { -long long int instr_new_paje_id (void) -{ - static long long int type_id = 0; - return type_id++; -} +Container* Container::root_container_ = nullptr; /* the root container */ +std::map> Container::all_containers_; /* all created containers indexed by name */ -void PJ_container_alloc (void) +NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* parent) + : Container::Container(name, "", parent) { - allContainers = xbt_dict_new_homogeneous(NULL); - trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free_f); - trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free_f); + 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 = std::string("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_release (void) +RouterContainer::RouterContainer(const std::string& name, Container* parent) + : Container::Container(name, "ROUTER", parent) { - xbt_dict_free (&allContainers); - xbt_dict_free (&trivaNodeTypes); - xbt_dict_free (&trivaEdgeTypes); + 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()); } -void PJ_container_set_root (container_t root) +HostContainer::HostContainer(s4u::Host const& host, NetZoneContainer* parent) + : Container::Container(host.get_name(), "HOST", parent) { - rootContainer = root; + xbt_assert(parent, "Only the Root container has no parent"); + xbt_assert(host.get_netpoint(), "Element '%s' not found", host.get_cname()); } -container_t PJ_container_new (const char *name, e_container_types kind, container_t father) +Container::Container(const std::string& name, const std::string& type_name, Container* parent) + : name_(name), parent_(parent) { - if (name == NULL){ - THROWF (tracing_error, 0, "can't create a container with a NULL name"); - } - static long long int container_id = 0; - char id_str[INSTR_DEFAULT_STR_SIZE]; - snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id++); - - container_t newContainer = xbt_new0(s_container_t, 1); - newContainer->name = xbt_strdup (name); // name of the container - newContainer->id = xbt_strdup (id_str); // id (or alias) of the container - newContainer->father = father; - sg_host_t sg_host = sg_host_by_name(name); - - //Search for network_element_t - switch (kind){ - case INSTR_HOST: - newContainer->netcard = sg_host->pimpl_netcard; - if(!newContainer->netcard) xbt_die("Element '%s' not found",name); - break; - case INSTR_ROUTER: - newContainer->netcard = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL); - if(!newContainer->netcard) xbt_die("Element '%s' not found",name); - break; - case INSTR_AS: - newContainer->netcard = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL); - if(!newContainer->netcard) xbt_die("Element '%s' not found",name); - break; - default: - newContainer->netcard = NULL; - break; - } + id_ = container_id; // id (or alias) of the container + container_id++; - // level depends on level of father - if (newContainer->father){ - newContainer->level = newContainer->father->level+1; - XBT_DEBUG("new container %s, child of %s", name, father->name); - }else{ - newContainer->level = 0; - } - // type definition (method depends on kind of this new container) - newContainer->kind = kind; - if (newContainer->kind == 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", newContainer->level); - if (newContainer->father){ - newContainer->type = PJ_type_get_or_null (as_typename, newContainer->father->type); - if (newContainer->type == NULL){ - newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type); - } - }else{ - newContainer->type = PJ_type_container_new ("0", NULL); - } - }else{ - //otherwise, the name is its kind - char typeNameBuff[INSTR_DEFAULT_STR_SIZE]; - switch (newContainer->kind){ - case INSTR_HOST: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "HOST"); break; - case INSTR_LINK: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "LINK"); break; - case INSTR_ROUTER: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "ROUTER"); break; - case INSTR_SMPI: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MPI"); break; - case INSTR_MSG_PROCESS: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_PROCESS"); break; - case INSTR_MSG_VM: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_VM"); break; - case INSTR_MSG_TASK: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_TASK"); break; - default: THROWF (tracing_error, 0, "new container kind is unknown."); break; - } - type_t type = PJ_type_get_or_null (typeNameBuff, newContainer->father->type); - if (type == NULL){ - newContainer->type = PJ_type_container_new (typeNameBuff, newContainer->father->type); - }else{ - newContainer->type = type; + if (parent_) { + XBT_DEBUG("new container %s, child of %s", get_cname(), parent->get_cname()); + + if (not type_name.empty()) { + type_ = parent_->type_->by_name_or_create(type_name); + parent_->children_.try_emplace(name_, this); + on_creation(*this); } } - newContainer->children = xbt_dict_new_homogeneous(NULL); - if (newContainer->father){ - xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, NULL); - new_pajeCreateContainer (newContainer); - } //register all kinds by name - if (xbt_dict_get_or_null(allContainers, newContainer->name) != NULL){ - THROWF(tracing_error, 1, "container %s already present in allContainers data structure", newContainer->name); - } - - xbt_dict_set (allContainers, newContainer->name, newContainer, NULL); - XBT_DEBUG("Add container name '%s'",newContainer->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 (newContainer->kind == INSTR_HOST || newContainer->kind == INSTR_LINK || newContainer->kind == INSTR_ROUTER) { - xbt_dict_set (trivaNodeTypes, newContainer->type->name, xbt_strdup("1"), NULL); - } - return newContainer; + XBT_DEBUG("Add container name '%s'", get_cname()); } -container_t PJ_container_get (const char *name) +Container::~Container() { - container_t ret = PJ_container_get_or_null (name); - if (ret == NULL){ - THROWF(tracing_error, 1, "container with name %s not found", name); - } - return ret; + 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_); + + // 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); + + on_destruction(*this); } -container_t PJ_container_get_or_null (const char *name) +void Container::create_child(const std::string& name, const std::string& type_name) { - return (container_t)(name ? xbt_dict_get_or_null(allContainers, name) : NULL); + new Container(name, type_name, this); } -container_t PJ_container_get_root () +Container* Container::by_name_or_null(const std::string& name) { - return rootContainer; + auto cont = all_containers_.find(name); + return cont == all_containers_.end() ? nullptr : cont->second; } -void PJ_container_remove_from_parent (container_t child) +Container* Container::by_name(const std::string& name) { - if (child == NULL){ - THROWF (tracing_error, 0, "can't remove from parent with a NULL child"); - } + Container* ret = Container::by_name_or_null(name); + xbt_assert(ret != nullptr, "container with name %s not found", name.c_str()); - container_t parent = child->father; - if (parent){ - XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", - child->name, - parent->name); - xbt_dict_remove (parent->children, child->name); - } + return ret; } -void PJ_container_free (container_t container) +void Container::remove_from_parent() { - if (container == NULL){ - THROWF (tracing_error, 0, "trying to free a NULL container"); - } - XBT_DEBUG("destroy container %s", container->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 (!TRACE_disable_destroy() && container != PJ_container_get_root()){ - //do not trace the container destruction if user requests - //or if the container is root - new_pajeDestroyContainer(container); + if (parent_) { + XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get_cname(), parent_->get_cname()); + parent_->children_.erase(name_); } + delete this; +} - //remove it from allContainers data structure - xbt_dict_remove (allContainers, container->name); - - //free - xbt_free (container->name); - xbt_free (container->id); - xbt_dict_free (&container->children); - xbt_free (container); - container = NULL; +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 == NULL){ - THROWF (tracing_error, 0, "trying to recursively destroy a NULL container"); - } - XBT_DEBUG("recursiveDestroyContainer %s", container->name); - xbt_dict_cursor_t cursor = NULL; - container_t child; - char *child_name; - xbt_dict_foreach(container->children, cursor, child_name, child) { - recursiveDestroyContainer (child); - } - PJ_container_free (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 == NULL){ - THROWF (tracing_error, 0, "trying to free all containers, but root is NULL"); - } - recursiveDestroyContainer (root); - rootContainer = NULL; + return static_cast(type_->by_name(name)->set_calling_container(this)); +} - //checks - if (!xbt_dict_is_empty(allContainers)){ - 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 instr +} // namespace simgrid