X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f00c01b0075574cf3ed7db9096034498d91948fc..4326c258372488ae763695bc79b0529ab96cc20d:/src/instr/instr_paje_containers.cpp

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index c06da673dc..941f2decfa 100644
--- a/src/instr/instr_paje_containers.cpp
+++ b/src/instr/instr_paje_containers.cpp
@@ -1,158 +1,152 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2020. 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/Exception.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
-#include "surf/surf.h"
 #include "src/instr/instr_private.hpp"
 
-#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 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 */
+static std::map<std::string, container_t> allContainers; /* all created containers indexed by name */
 
-long long int instr_new_paje_id ()
+namespace simgrid {
+namespace instr {
+
+long long int new_paje_id()
 {
   static long long int type_id = 0;
   return type_id++;
 }
 
-container_t PJ_container_get_root()
+Container* Container::get_root()
 {
   return rootContainer;
 }
 
-void PJ_container_set_root (container_t root)
+NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father)
+    : Container::Container(name, "", father)
 {
-  rootContainer = root;
+  xbt_assert(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "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});
+    on_creation(*this);
+  } else {
+    type_         = new ContainerType("0");
+    rootContainer = this;
+  }
 }
 
-namespace simgrid {
-namespace instr {
+RouterContainer::RouterContainer(const std::string& name, Container* father)
+    : Container::Container(name, "ROUTER", father)
+{
+  xbt_assert(father, "Only the Root container has no father");
+  xbt_assert(s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Element '%s' not found", get_cname());
+}
 
-Container::Container(std::string name, e_container_types kind, Container* father)
-    : name_(name), kind_(kind), father_(father)
+HostContainer::HostContainer(s4u::Host const& host, NetZoneContainer* father)
+    : Container::Container(host.get_name(), "HOST", father)
+{
+  xbt_assert(father, "Only the Root container has no father");
+  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)
 {
   static long long int container_id = 0;
-  id_                               = std::to_string(container_id); // id (or alias) of the container
+  id_                               = container_id; // id (or alias) of the container
   container_id++;
 
   if (father_) {
-    level_ = father_->level_ + 1;
-    XBT_DEBUG("new container %s, child of %s", name.c_str(), father->name_.c_str());
-  }
-
-  // Search for network_element_t for AS, ROUTER and HOST
-  // Name the kind of container. For AS otherwise, the name depends on its level
-  std::string typeNameBuff;
-  switch (kind_) {
-    case INSTR_AS:
-      netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
-      xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
-      typeNameBuff = std::string("L") + std::to_string(level_);
-      break;
-    case INSTR_ROUTER:
-      netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
-      xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
-      typeNameBuff = std::string("ROUTER");
-      break;
-    case INSTR_HOST:
-      netpoint_ = sg_host_by_name(name.c_str())->pimpl_netpoint;
-      xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
-      typeNameBuff = std::string("HOST");
-      break;
-    case INSTR_LINK:
-      typeNameBuff = std::string("LINK");
-      break;
-    case INSTR_SMPI:
-      typeNameBuff = std::string("MPI");
-      break;
-    case INSTR_MSG_PROCESS:
-      typeNameBuff = std::string("MSG_PROCESS");
-      break;
-    case INSTR_MSG_VM:
-      typeNameBuff = std::string("MSG_VM");
-      break;
-    case INSTR_MSG_TASK:
-      typeNameBuff = std::string("MSG_TASK");
-      break;
-    default:
-      THROWF(tracing_error, 0, "new container kind is unknown.");
-      break;
-  }
+    XBT_DEBUG("new container %s, child of %s", get_cname(), father->get_cname());
 
-  if (father_) {
-    type_ = father_->type_->getChildOrNull(typeNameBuff);
-    if (type_ == nullptr) {
-      type_ = Type::containerNew(typeNameBuff.c_str(), father_->type_);
+    if (not type_name.empty()) {
+      type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
+      father_->children_.insert({name_, this});
+      on_creation(*this);
     }
-    father_->children_.insert({name_, this});
-    LogContainerCreation(this);
-  } else if (kind_ == INSTR_AS) {
-    type_ = Type::containerNew("0", nullptr);
   }
 
   //register all kinds by name
-  if (not allContainers.emplace(name_, this).second) {
-    THROWF(tracing_error, 1, "container %s already present in allContainers data structure", name_.c_str());
-  }
+  if (not allContainers.emplace(name_, this).second)
+    throw TracingError(XBT_THROW_POINT,
+                       xbt::string_printf("container %s already present in allContainers data structure", get_cname()));
 
-  XBT_DEBUG("Add container name '%s'", name_.c_str());
-
-  //register NODE types for triva configuration
-  if (kind_ == INSTR_HOST || kind_ == INSTR_LINK || kind_ == INSTR_ROUTER)
-    trivaNodeTypes.insert(type_->getName());
+  XBT_DEBUG("Add container name '%s'", get_cname());
 }
 
 Container::~Container()
 {
-  XBT_DEBUG("destroy container %s", name_.c_str());
+  XBT_DEBUG("destroy container %s", get_cname());
   // Begin with destroying my own children
-  for (auto child : children_) {
+  for (auto child : children_)
     delete child.second;
-  }
+
+  // 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
-  TRACE_last_timestamp_to_dump = surf_get_clock();
-  TRACE_paje_dump_buffer(1);
+  last_timestamp_to_dump = SIMIX_get_clock();
+  dump_buffer(true);
 
-  // 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);
-  }
+  on_destruction(*this);
+}
 
-  // remove me from the allContainers data structure
-  allContainers.erase(name_);
+void Container::create_child(const std::string& name, const std::string& type_name)
+{
+  new Container(name, type_name, this);
 }
 
-Container* Container::byNameOrNull(std::string name)
+Container* Container::by_name_or_null(const std::string& name)
 {
   auto cont = allContainers.find(name);
   return cont == allContainers.end() ? nullptr : cont->second;
 }
 
-Container* Container::byName(std::string name)
+Container* Container::by_name(const std::string& name)
 {
-  Container* ret = Container::byNameOrNull(name);
-  if (ret == nullptr)
-    THROWF(tracing_error, 1, "container with name %s not found", name.c_str());
+  Container* ret = Container::by_name_or_null(name);
+  xbt_assert(ret != nullptr, "container with name %s not found", name.c_str());
 
   return ret;
 }
 
-void Container::removeFromParent()
+void Container::remove_from_parent()
 {
   if (father_) {
-    XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", name_.c_str(), father_->name_.c_str());
+    XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get_cname(), father_->get_cname());
     father_->children_.erase(name_);
   }
+  delete this;
 }
+
+StateType* Container::get_state(const std::string& name)
+{
+  return static_cast<StateType*>(type_->by_name(name)->set_calling_container(this));
 }
+
+LinkType* Container::get_link(const std::string& name)
+{
+  return static_cast<LinkType*>(type_->by_name(name)->set_calling_container(this));
+}
+
+VariableType* Container::get_variable(const std::string& name)
+{
+  return static_cast<VariableType*>(type_->by_name(name)->set_calling_container(this));
 }
+
+EntityValue::EntityValue(const std::string& name, const std::string& color, Type* father)
+    : name_(name), color_(color), father_(father)
+{
+  id_ = simgrid::instr::new_paje_id();
+  on_creation(*this);
+}
+
+} // namespace instr
+} // namespace simgrid