X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/652eb99105d979fcd897c2f26cfbce0f7d81ecd3..c7edbf695cf8cae1e5bbca502b505d349510eebb:/src/instr/instr_paje_containers.cpp?ds=sidebyside diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 8dfd00c64a..3fd13280c2 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -1,20 +1,21 @@ -/* Copyright (c) 2010, 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2017. 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 "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" + #include "surf/surf.h" -#include "surf/surf_routing.h" + +#include "src/instr/instr_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)"); static container_t rootContainer = nullptr; /* the root container */ static xbt_dict_t allContainers = nullptr; /* all created containers indexed by name */ -xbt_dict_t trivaNodeTypes = nullptr; /* all host types defined */ -xbt_dict_t trivaEdgeTypes = nullptr; /* all link types defined */ +std::set trivaNodeTypes; /* all host types defined */ +std::set trivaEdgeTypes; /* all link types defined */ long long int instr_new_paje_id () { @@ -25,15 +26,11 @@ long long int instr_new_paje_id () void PJ_container_alloc () { allContainers = xbt_dict_new_homogeneous(nullptr); - trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free_f); - trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free_f); } void PJ_container_release () { xbt_dict_free (&allContainers); - xbt_dict_free (&trivaNodeTypes); - xbt_dict_free (&trivaEdgeTypes); } void PJ_container_set_root (container_t root) @@ -41,7 +38,7 @@ void PJ_container_set_root (container_t root) rootContainer = root; } -container_t PJ_container_new (const char *name, e_container_types kind, container_t father) +container_t PJ_container_new(const char* name, simgrid::instr::e_container_types kind, container_t father) { if (name == nullptr){ THROWF (tracing_error, 0, "can't create a container with a nullptr name"); @@ -52,7 +49,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id); container_id++; - container_t newContainer = xbt_new0(s_container_t, 1); + container_t newContainer = xbt_new0(simgrid::instr::s_container, 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; @@ -60,20 +57,20 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe //Search for network_element_t switch (kind){ - case INSTR_HOST: - newContainer->netcard = sg_host->pimpl_netcard; - xbt_assert(newContainer->netcard, "Element '%s' not found",name); + case simgrid::instr::INSTR_HOST: + newContainer->netpoint = sg_host->pimpl_netpoint; + xbt_assert(newContainer->netpoint, "Element '%s' not found", name); break; - case INSTR_ROUTER: - newContainer->netcard = static_cast(xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL)); - xbt_assert(newContainer->netcard, "Element '%s' not found",name); + case simgrid::instr::INSTR_ROUTER: + newContainer->netpoint = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); + xbt_assert(newContainer->netpoint, "Element '%s' not found", name); break; - case INSTR_AS: - newContainer->netcard = static_cast(xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL)); - xbt_assert(newContainer->netcard, "Element '%s' not found",name); + case simgrid::instr::INSTR_AS: + newContainer->netpoint = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); + xbt_assert(newContainer->netpoint, "Element '%s' not found", name); break; default: - newContainer->netcard = nullptr; + newContainer->netpoint = nullptr; break; } @@ -86,50 +83,50 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe } // type definition (method depends on kind of this new container) newContainer->kind = kind; - if (newContainer->kind == INSTR_AS){ + if (newContainer->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", newContainer->level); if (newContainer->father){ - newContainer->type = PJ_type_get_or_null (as_typename, newContainer->father->type); + newContainer->type = simgrid::instr::Type::getOrNull(as_typename, newContainer->father->type); if (newContainer->type == nullptr){ - newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type); + newContainer->type = simgrid::instr::Type::containerNew(as_typename, newContainer->father->type); } }else{ - newContainer->type = PJ_type_container_new ("0", nullptr); + newContainer->type = simgrid::instr::Type::containerNew("0", nullptr); } }else{ //otherwise, the name is its kind char typeNameBuff[INSTR_DEFAULT_STR_SIZE]; switch (newContainer->kind){ - case INSTR_HOST: + case simgrid::instr::INSTR_HOST: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "HOST"); break; - case INSTR_LINK: + case simgrid::instr::INSTR_LINK: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "LINK"); break; - case INSTR_ROUTER: + case simgrid::instr::INSTR_ROUTER: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "ROUTER"); break; - case INSTR_SMPI: + case simgrid::instr::INSTR_SMPI: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MPI"); break; - case INSTR_MSG_PROCESS: + case simgrid::instr::INSTR_MSG_PROCESS: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_PROCESS"); break; - case INSTR_MSG_VM: + case simgrid::instr::INSTR_MSG_VM: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_VM"); break; - case INSTR_MSG_TASK: + 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; } - type_t type = PJ_type_get_or_null (typeNameBuff, newContainer->father->type); + simgrid::instr::Type* type = simgrid::instr::Type::getOrNull(typeNameBuff, newContainer->father->type); if (type == nullptr){ - newContainer->type = PJ_type_container_new (typeNameBuff, newContainer->father->type); + newContainer->type = simgrid::instr::Type::containerNew(typeNameBuff, newContainer->father->type); }else{ newContainer->type = type; } @@ -137,7 +134,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe newContainer->children = xbt_dict_new_homogeneous(nullptr); if (newContainer->father){ xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, nullptr); - new_pajeCreateContainer (newContainer); + LogContainerCreation(newContainer); } //register all kinds by name @@ -149,8 +146,9 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe XBT_DEBUG("Add container name '%s'",newContainer->name); //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"), nullptr); + if (newContainer->kind == simgrid::instr::INSTR_HOST || newContainer->kind == simgrid::instr::INSTR_LINK || + newContainer->kind == simgrid::instr::INSTR_ROUTER) { + trivaNodeTypes.insert(newContainer->type->name); } return newContainer; } @@ -198,14 +196,14 @@ void PJ_container_free (container_t container) //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(); + simgrid::instr::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()){ + if (not 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); + LogContainerDestruction(container); } //remove it from allContainers data structure @@ -244,7 +242,7 @@ void PJ_container_free_all () rootContainer = nullptr; //checks - if (!xbt_dict_is_empty(allContainers)){ + if (not xbt_dict_is_empty(allContainers)) { THROWF(tracing_error, 0, "some containers still present even after destroying all of them"); } }