#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-
#include "surf/surf.h"
+#include "src/instr/instr_private.hpp"
-#include "src/instr/instr_private.h"
+#include <unordered_map>
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 */
+static std::unordered_map<std::string, container_t> allContainers; /* all created containers indexed by name */
+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 ()
{
return type_id++;
}
-void PJ_container_alloc ()
+container_t PJ_container_get_root()
{
- 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);
+ return rootContainer;
}
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)
-{
- if (name == nullptr){
- THROWF (tracing_error, 0, "can't create a container with a nullptr name");
- }
+namespace simgrid {
+namespace instr {
+Container::Container(std::string name, e_container_types kind, Container* father)
+ : name_(name), kind_(kind), father_(father)
+{
static long long int container_id = 0;
- char id_str[INSTR_DEFAULT_STR_SIZE];
- snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id);
+ id_ = std::to_string(container_id); // id (or alias) of the container
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->netpoint = sg_host->pimpl_netpoint;
- xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
+ this->netpoint_ = sg_host_by_name(name.c_str())->pimpl_netpoint;
+ xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str());
break;
case INSTR_ROUTER:
- newContainer->netpoint = simgrid::s4u::Engine::instance()->netpointByNameOrNull(name);
- xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
+ this->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+ xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str());
break;
case INSTR_AS:
- newContainer->netpoint = simgrid::s4u::Engine::instance()->netpointByNameOrNull(name);
- xbt_assert(newContainer->netpoint, "Element '%s' not found", name);
+ this->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+ xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str());
break;
default:
- newContainer->netpoint = nullptr;
+ this->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);
- }else{
- newContainer->level = 0;
+ if (father_) {
+ this->level_ = father_->level_ + 1;
+ XBT_DEBUG("new container %s, child of %s", name.c_str(), father->name_.c_str());
}
+
// type definition (method depends on kind of this new container)
- newContainer->kind = kind;
- if (newContainer->kind == INSTR_AS){
+ if (this->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 == nullptr){
- newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type);
+ snprintf(as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", this->level_);
+ if (this->father_) {
+ this->type_ = this->father_->type_->getChildOrNull(as_typename);
+ if (this->type_ == nullptr) {
+ this->type_ = Type::containerNew(as_typename, this->father_->type_);
}
}else{
- newContainer->type = PJ_type_container_new ("0", nullptr);
+ this->type_ = Type::containerNew("0", nullptr);
}
- }else{
+ } else {
//otherwise, the name is its kind
char typeNameBuff[INSTR_DEFAULT_STR_SIZE];
- switch (newContainer->kind){
+ switch (this->kind_) {
case INSTR_HOST:
snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "HOST");
break;
THROWF (tracing_error, 0, "new container kind is unknown.");
break;
}
- type_t type = PJ_type_get_or_null (typeNameBuff, newContainer->father->type);
+ Type* type = this->father_->type_->getChildOrNull(typeNameBuff);
if (type == nullptr){
- newContainer->type = PJ_type_container_new (typeNameBuff, newContainer->father->type);
+ this->type_ = Type::containerNew(typeNameBuff, this->father_->type_);
}else{
- newContainer->type = type;
+ this->type_ = type;
}
}
- newContainer->children = xbt_dict_new_homogeneous(nullptr);
- if (newContainer->father){
- xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, nullptr);
- LogContainerCreation(newContainer);
+ if (this->father_) {
+ this->father_->children_.insert({this->name_, this});
+ LogContainerCreation(this);
}
//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 (not allContainers.emplace(this->name_, this).second) {
+ THROWF(tracing_error, 1, "container %s already present in allContainers data structure", this->name_.c_str());
}
- xbt_dict_set (allContainers, newContainer->name, newContainer, nullptr);
- XBT_DEBUG("Add container name '%s'",newContainer->name);
+ XBT_DEBUG("Add container name '%s'", this->name_.c_str());
//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);
- }
- return newContainer;
-}
-
-container_t PJ_container_get (const char *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;
-}
-
-container_t PJ_container_get_or_null (const char *name)
-{
- return static_cast<container_t>(name != nullptr ? xbt_dict_get_or_null(allContainers, name) : nullptr);
-}
-
-container_t PJ_container_get_root ()
-{
- return rootContainer;
-}
-
-void PJ_container_remove_from_parent (container_t child)
-{
- if (child == nullptr){
- THROWF (tracing_error, 0, "can't remove from parent with a nullptr child");
- }
-
- container_t parent = child->father;
- if (parent){
- XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ",
- child->name,
- parent->name);
- xbt_dict_remove (parent->children, child->name);
+ if (this->kind_ == INSTR_HOST || this->kind_ == INSTR_LINK || this->kind_ == INSTR_ROUTER) {
+ trivaNodeTypes.insert(this->type_->getName());
}
}
-void PJ_container_free (container_t container)
+Container::~Container()
{
- if (container == nullptr){
- THROWF (tracing_error, 0, "trying to free a nullptr container");
+ XBT_DEBUG("destroy container %s", name_.c_str());
+ // Begin with destroying my own children
+ for (auto child : children_) {
+ delete child.second;
}
- XBT_DEBUG("destroy container %s", container->name);
- //obligation to dump previous events because they might
- //reference the container that is about to be destroyed
+ // 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() && container != PJ_container_get_root()) {
- //do not trace the container destruction if user requests
- //or if the container is root
- LogContainerDestruction(container);
+ // 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);
}
- //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 = nullptr;
+ // remove me from the allContainers data structure
+ allContainers.erase(name_);
}
-static void recursiveDestroyContainer (container_t container)
+Container* Container::byNameOrNull(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);
- }
- PJ_container_free (container);
+ auto cont = allContainers.find(name);
+ return cont == allContainers.end() ? nullptr : cont->second;
}
-void PJ_container_free_all ()
+Container* Container::byName(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;
+ Container* ret = Container::byNameOrNull(name);
+ if (ret == nullptr)
+ THROWF(tracing_error, 1, "container with name %s not found", name.c_str());
- //checks
- if (not xbt_dict_is_empty(allContainers)) {
- THROWF(tracing_error, 0, "some containers still present even after destroying all of them");
+ return ret;
+}
+
+void Container::removeFromParent()
+{
+ if (father_) {
+ XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", name_.c_str(), father_->name_.c_str());
+ father_->children_.erase(name_);
}
}
+}
+}
