X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f6cbb176d4301cae36a945dfa57e6b6a9cbafef..b3a756fa6fe08c4f377ce22d205ef5c1b28bd250:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 31f825e466..b5d980047f 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -1,35 +1,36 @@ -/* 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 = 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 */ +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 */ -long long int instr_new_paje_id (void) +long long int instr_new_paje_id () { static long long int type_id = 0; return type_id++; } -void PJ_container_alloc (void) +void PJ_container_alloc () { - allContainers = xbt_dict_new_homogeneous(NULL); + 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 (void) +void PJ_container_release () { xbt_dict_free (&allContainers); xbt_dict_free (&trivaNodeTypes); @@ -43,13 +44,14 @@ void PJ_container_set_root (container_t root) container_t PJ_container_new (const char *name, e_container_types kind, container_t father) { - if (name == NULL){ - THROWF (tracing_error, 0, "can't create a container with a NULL name"); + if (name == nullptr){ + THROWF (tracing_error, 0, "can't create a container with a nullptr 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++); + snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id); + container_id++; container_t newContainer = xbt_new0(s_container_t, 1); newContainer->name = xbt_strdup (name); // name of the container @@ -60,19 +62,19 @@ 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; - if(!newContainer->netcard) xbt_die("Element '%s' not found",name); + newContainer->netpoint = sg_host->pimpl_netpoint; + xbt_assert(newContainer->netpoint, "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); + newContainer->netpoint = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); + xbt_assert(newContainer->netpoint, "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); + newContainer->netpoint = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); + xbt_assert(newContainer->netpoint, "Element '%s' not found", name); break; default: - newContainer->netcard = NULL; + newContainer->netpoint = nullptr; break; } @@ -91,49 +93,65 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe 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){ + if (newContainer->type == nullptr){ newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type); } }else{ - newContainer->type = PJ_type_container_new ("0", NULL); + newContainer->type = PJ_type_container_new ("0", nullptr); } }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; + 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){ + if (type == nullptr){ newContainer->type = PJ_type_container_new (typeNameBuff, newContainer->father->type); }else{ newContainer->type = type; } } - newContainer->children = xbt_dict_new_homogeneous(NULL); + newContainer->children = xbt_dict_new_homogeneous(nullptr); if (newContainer->father){ - xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, NULL); - new_pajeCreateContainer (newContainer); + xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, nullptr); + LogContainerCreation(newContainer); } //register all kinds by name - if (xbt_dict_get_or_null(allContainers, newContainer->name) != NULL){ + if (xbt_dict_get_or_null(allContainers, newContainer->name) != nullptr){ THROWF(tracing_error, 1, "container %s already present in allContainers data structure", newContainer->name); } - xbt_dict_set (allContainers, newContainer->name, newContainer, NULL); + xbt_dict_set (allContainers, newContainer->name, newContainer, nullptr); 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"), NULL); + xbt_dict_set (trivaNodeTypes, newContainer->type->name, xbt_strdup("1"), nullptr); } return newContainer; } @@ -141,7 +159,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe container_t PJ_container_get (const char *name) { container_t ret = PJ_container_get_or_null (name); - if (ret == NULL){ + if (ret == nullptr){ THROWF(tracing_error, 1, "container with name %s not found", name); } return ret; @@ -149,7 +167,7 @@ container_t PJ_container_get (const char *name) container_t PJ_container_get_or_null (const char *name) { - return (container_t)(name ? xbt_dict_get_or_null(allContainers, name) : NULL); + return static_cast(name != nullptr ? xbt_dict_get_or_null(allContainers, name) : nullptr); } container_t PJ_container_get_root () @@ -159,8 +177,8 @@ container_t PJ_container_get_root () void PJ_container_remove_from_parent (container_t child) { - if (child == NULL){ - THROWF (tracing_error, 0, "can't remove from parent with a NULL child"); + if (child == nullptr){ + THROWF (tracing_error, 0, "can't remove from parent with a nullptr child"); } container_t parent = child->father; @@ -174,8 +192,8 @@ void PJ_container_remove_from_parent (container_t child) void PJ_container_free (container_t container) { - if (container == NULL){ - THROWF (tracing_error, 0, "trying to free a NULL container"); + if (container == nullptr){ + THROWF (tracing_error, 0, "trying to free a nullptr container"); } XBT_DEBUG("destroy container %s", container->name); @@ -185,10 +203,10 @@ void PJ_container_free (container_t container) 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 @@ -199,16 +217,16 @@ void PJ_container_free (container_t container) xbt_free (container->id); xbt_dict_free (&container->children); xbt_free (container); - container = NULL; + container = nullptr; } static void recursiveDestroyContainer (container_t container) { - if (container == NULL){ - THROWF (tracing_error, 0, "trying to recursively destroy a NULL container"); + 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 = NULL; + xbt_dict_cursor_t cursor = nullptr; container_t child; char *child_name; xbt_dict_foreach(container->children, cursor, child_name, child) { @@ -220,14 +238,14 @@ static void recursiveDestroyContainer (container_t container) void PJ_container_free_all () { container_t root = PJ_container_get_root(); - if (root == NULL){ - THROWF (tracing_error, 0, "trying to free all containers, but root is NULL"); + if (root == nullptr){ + THROWF (tracing_error, 0, "trying to free all containers, but root is nullptr"); } recursiveDestroyContainer (root); - rootContainer = NULL; + 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"); } }