-/* 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 "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
-#include <xbt/dict.h>
-#include <xbt/lib.h>
-#include <xbt/log.h>
-
-#include <surf/surf.h>
-#include <surf/surf_routing.h>
+#include "surf/surf.h"
#include "src/instr/instr_private.h"
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<std::string> trivaNodeTypes; /* all host types defined */
+std::set<std::string> trivaEdgeTypes; /* all link types defined */
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)
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");
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
- newContainer->id = xbt_strdup (id_str); // id (or alias) of the container
- newContainer->father = father;
+ container_t newContainer = xbt_new0(simgrid::instr::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;
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_netpoint;
- 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 = simgrid::s4u::Engine::instance()->netcardByNameOrNull(name);
- 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 = simgrid::s4u::Engine::instance()->netcardByNameOrNull(name);
- 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;
}
// 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);
+ if (newContainer->father_) {
+ newContainer->level_ = newContainer->father_->level_ + 1;
+ XBT_DEBUG("new container %s, child of %s", name, father->name_);
}else{
- newContainer->level = 0;
+ newContainer->level_ = 0;
}
// type definition (method depends on kind of this new container)
- newContainer->kind = kind;
- if (newContainer->kind == INSTR_AS){
+ newContainer->kind_ = kind;
+ 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);
- if (newContainer->type == nullptr){
- newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type);
+ snprintf(as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", newContainer->level_);
+ if (newContainer->father_) {
+ newContainer->type_ = simgrid::instr::Type::getOrNull(as_typename, newContainer->father_->type_);
+ if (newContainer->type_ == nullptr) {
+ 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:
+ switch (newContainer->kind_) {
+ 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;
+ newContainer->type_ = type;
}
}
- newContainer->children = xbt_dict_new_homogeneous(nullptr);
- if (newContainer->father){
- xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, nullptr);
- new_pajeCreateContainer (newContainer);
+ newContainer->children_ = xbt_dict_new_homogeneous(nullptr);
+ if (newContainer->father_) {
+ 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) != nullptr){
- THROWF(tracing_error, 1, "container %s already present in allContainers data structure", newContainer->name);
+ 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, nullptr);
- XBT_DEBUG("Add container name '%s'",newContainer->name);
+ 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"), 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;
}
THROWF (tracing_error, 0, "can't remove from parent with a nullptr child");
}
- container_t parent = child->father;
+ container_t parent = child->father_;
if (parent){
- XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ",
- child->name,
- parent->name);
- xbt_dict_remove (parent->children, child->name);
+ XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", child->name_, parent->name_);
+ xbt_dict_remove(parent->children_, child->name_);
}
}
if (container == nullptr){
THROWF (tracing_error, 0, "trying to free a nullptr container");
}
- XBT_DEBUG("destroy container %s", container->name);
+ 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_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
- xbt_dict_remove (allContainers, container->name);
+ xbt_dict_remove(allContainers, container->name_);
//free
- xbt_free (container->name);
- xbt_free (container->id);
- xbt_dict_free (&container->children);
+ xbt_free(container->name_);
+ xbt_free(container->id_);
+ xbt_dict_free(&container->children_);
xbt_free (container);
container = nullptr;
}
if (container == nullptr){
THROWF (tracing_error, 0, "trying to recursively destroy a nullptr container");
}
- XBT_DEBUG("recursiveDestroyContainer %s", container->name);
+ 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) {
+ xbt_dict_foreach (container->children_, cursor, child_name, child) {
recursiveDestroyContainer (child);
}
PJ_container_free (container);
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");
}
}
