X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/03ce6a2e7863fe994d12ca8ab9141b4f6fdb5f8e..78ac10bd286f7403b2ea645b68eda599e1035092:/src/instr/instr_paje_containers.cpp

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index e0c22b18d2..63b9a03a3e 100644
--- a/src/instr/instr_paje_containers.cpp
+++ b/src/instr/instr_paje_containers.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. 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. */
@@ -6,6 +6,10 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/instr/instr_private.hpp"
+#include <sys/stat.h>
+#ifdef WIN32
+#include <direct.h> // _mkdir
+#endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
 
@@ -32,11 +36,11 @@ container_t Container::get_root()
   return rootContainer;
 }
 
-NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father)
+NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father)
     : Container::Container(name, "", father)
 {
-  netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name);
-  xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
+  netpoint_ = simgrid::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);
@@ -48,18 +52,19 @@ NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZone
   }
 }
 
-RouterContainer::RouterContainer(std::string name, Container* father) : Container::Container(name, "ROUTER", father)
+RouterContainer::RouterContainer(const std::string& name, Container* father)
+    : Container::Container(name, "ROUTER", father)
 {
   xbt_assert(father, "Only the Root container has no father");
 
-  netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name);
-  xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
+  netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name());
+  xbt_assert(netpoint_, "Element '%s' not found", get_cname());
 
   trivaNodeTypes.insert(type_->get_name());
 }
 
-HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
-    : Container::Container(host.get_cname(), "HOST", father)
+HostContainer::HostContainer(simgrid::s4u::Host const& host, NetZoneContainer* father)
+    : Container::Container(host.get_name(), "HOST", father)
 {
   xbt_assert(father, "Only the Root container has no father");
 
@@ -69,14 +74,15 @@ HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
   trivaNodeTypes.insert(type_->get_name());
 }
 
-Container::Container(std::string name, std::string type_name, Container* father) : name_(name), father_(father)
+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_                               = container_id; // id (or alias) of the container
   container_id++;
 
   if (father_) {
-    XBT_DEBUG("new container %s, child of %s", name.c_str(), father->name_.c_str());
+    XBT_DEBUG("new container %s, child of %s", get_cname(), father->get_cname());
 
     if (not type_name.empty()) {
       type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
@@ -87,9 +93,9 @@ Container::Container(std::string name, std::string type_name, Container* father)
 
   //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());
+    THROWF(tracing_error, 1, "container %s already present in allContainers data structure", get_cname());
 
-  XBT_DEBUG("Add container name '%s'", name_.c_str());
+  XBT_DEBUG("Add container name '%s'", get_cname());
 
   //register NODE types for triva configuration
   if (type_name == "LINK")
@@ -98,7 +104,7 @@ Container::Container(std::string name, std::string type_name, Container* father)
 
 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_)
     delete child.second;
@@ -115,18 +121,18 @@ Container::~Container()
   allContainers.erase(name_);
 }
 
-void Container::create_child(std::string name, std::string type_name)
+void Container::create_child(const std::string& name, const std::string& type_name)
 {
   new Container(name, type_name, this);
 }
 
-Container* Container::by_name_or_null(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::by_name(std::string name)
+Container* Container::by_name(const std::string& name)
 {
   Container* ret = Container::by_name_or_null(name);
   xbt_assert(ret != nullptr, "container with name %s not found", name.c_str());
@@ -152,7 +158,13 @@ void Container::log_creation()
 
   if (trace_format == simgrid::instr::TraceFormat::Paje) {
     stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_CreateContainer << " ";
-    stream << timestamp << " " << id_ << " " << type_->get_id() << " " << father_->id_ << " \"" << name_ << "\"";
+    stream << timestamp << " " << id_ << " " << type_->get_id() << " " << father_->id_ << " \"";
+    if (name_.find("rank-") != 0)
+      stream << name_ << "\"";
+    else
+      /* Subtract -1 because this is the process id and we transform it to the rank id */
+      stream << "rank-" << stoi(name_.substr(5)) - 1 << "\"";
+
     XBT_DEBUG("Dump %s", stream.str().c_str());
     tracing_file << stream.str() << std::endl;
   } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
@@ -205,23 +217,23 @@ void Container::log_destruction()
   }
 }
 
-StateType* Container::get_state(std::string name)
+StateType* Container::get_state(const std::string& name)
 {
-  StateType* ret = dynamic_cast<StateType*>(type_->by_name(name));
+  StateType* ret = static_cast<StateType*>(type_->by_name(name));
   ret->set_calling_container(this);
   return ret;
 }
 
-LinkType* Container::get_link(std::string name)
+LinkType* Container::get_link(const std::string& name)
 {
-  LinkType* ret = dynamic_cast<LinkType*>(type_->by_name(name));
+  LinkType* ret = static_cast<LinkType*>(type_->by_name(name));
   ret->set_calling_container(this);
   return ret;
 }
 
-VariableType* Container::get_variable(std::string name)
+VariableType* Container::get_variable(const std::string& name)
 {
-  VariableType* ret = dynamic_cast<VariableType*>(type_->by_name(name));
+  VariableType* ret = static_cast<VariableType*>(type_->by_name(name));
   ret->set_calling_container(this);
   return ret;
 }