-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2023. 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. */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
-static container_t rootContainer = nullptr; /* the root container */
-static std::map<std::string, container_t> allContainers; /* all created containers indexed by name */
+namespace simgrid::instr {
-long long int instr_new_paje_id ()
-{
- static long long int type_id = 0;
- return type_id++;
-}
+Container* Container::root_container_ = nullptr; /* the root container */
+std::map<std::string, Container*, std::less<>> Container::all_containers_; /* all created containers indexed by name */
-namespace simgrid {
-namespace instr {
-
-Container* Container::get_root()
+NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* parent)
+ : Container::Container(name, "", parent)
{
- return rootContainer;
-}
-
-NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father)
- : Container::Container(name, "", father)
-{
- netpoint_ = s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name());
- xbt_assert(netpoint_, "Element '%s' not found", get_cname());
- if (father_) {
- std::string type_name = std::string("L") + std::to_string(level);
- type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
- father_->children_.insert({get_name(), this});
+ 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 = "L" + std::to_string(level);
+ type_ = parent_->type_->by_name_or_create<ContainerType>(type_name);
+ parent_->children_.try_emplace(get_name(), this);
on_creation(*this);
} else {
type_ = new ContainerType("0");
- rootContainer = this;
+ set_root(this);
}
}
-RouterContainer::RouterContainer(const std::string& name, Container* father)
- : Container::Container(name, "ROUTER", father)
+RouterContainer::RouterContainer(const std::string& name, Container* parent)
+ : Container::Container(name, "ROUTER", parent)
{
- xbt_assert(father, "Only the Root container has no father");
-
- netpoint_ = s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name());
- xbt_assert(netpoint_, "Element '%s' not found", get_cname());
+ 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());
}
-HostContainer::HostContainer(s4u::Host const& host, NetZoneContainer* father)
- : Container::Container(host.get_name(), "HOST", father)
+HostContainer::HostContainer(s4u::Host const& host, NetZoneContainer* parent)
+ : Container::Container(host.get_name(), "HOST", parent)
{
- xbt_assert(father, "Only the Root container has no father");
-
- netpoint_ = host.get_netpoint();
- xbt_assert(netpoint_, "Element '%s' not found", host.get_cname());
+ xbt_assert(parent, "Only the Root container has no parent");
+ xbt_assert(host.get_netpoint(), "Element '%s' not found", host.get_cname());
}
-Container::Container(const std::string& name, const std::string& type_name, Container* father)
- : name_(name), father_(father)
+Container::Container(const std::string& name, const std::string& type_name, Container* parent)
+ : name_(name), parent_(parent)
{
static long long int container_id = 0;
id_ = container_id; // id (or alias) of the container
container_id++;
- if (father_) {
- XBT_DEBUG("new container %s, child of %s", get_cname(), father->get_cname());
+ if (parent_) {
+ XBT_DEBUG("new container %s, child of %s", get_cname(), parent->get_cname());
if (not type_name.empty()) {
- type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
- father_->children_.insert({name_, this});
+ type_ = parent_->type_->by_name_or_create<ContainerType>(type_name);
+ parent_->children_.try_emplace(name_, this);
on_creation(*this);
}
}
//register all kinds by name
- if (not allContainers.emplace(name_, this).second)
+ if (not all_containers_.try_emplace(name_, this).second)
throw TracingError(XBT_THROW_POINT,
- xbt::string_printf("container %s already present in allContainers data structure", get_cname()));
+ xbt::string_printf("container %s already present in all_containers_", get_cname()));
XBT_DEBUG("Add container name '%s'", get_cname());
}
{
XBT_DEBUG("destroy container %s", get_cname());
// Begin with destroying my own children
- for (auto child : children_)
- delete child.second;
+ for (auto const& [_, child] : children_)
+ delete child;
+
+ // remove me from the all_containers_ data structure
+ all_containers_.erase(name_);
- // remove me from the allContainers data structure
- allContainers.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* Container::by_name_or_null(const std::string& name)
{
- auto cont = allContainers.find(name);
- return cont == allContainers.end() ? nullptr : cont->second;
+ auto cont = all_containers_.find(name);
+ return cont == all_containers_.end() ? nullptr : cont->second;
}
Container* Container::by_name(const std::string& name)
void Container::remove_from_parent()
{
- if (father_) {
- XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get_cname(), father_->get_cname());
- father_->children_.erase(name_);
+ if (parent_) {
+ XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get_cname(), parent_->get_cname());
+ parent_->children_.erase(name_);
}
delete this;
}
{
return static_cast<VariableType*>(type_->by_name(name)->set_calling_container(this));
}
-} // namespace instr
-} // namespace simgrid
+
+EntityValue::EntityValue(const std::string& name, const std::string& color, Type* parent)
+ : name_(name), color_(color), parent_(parent)
+{
+ on_creation(*this);
+}
+
+} // namespace simgrid::instr
