X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/instr/instr_paje_containers.cpp

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index 2f7a00fd47..49271aaae2 100644
--- a/src/instr/instr_paje_containers.cpp
+++ b/src/instr/instr_paje_containers.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. 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. */
@@ -9,8 +9,8 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
 
-extern FILE* tracing_file;
-extern std::map<container_t, FILE*> tracing_files; // TI specific
+extern std::ofstream tracing_file;
+std::map<container_t, std::ofstream*> tracing_files; // TI specific
 double prefix = 0.0;                               // TI specific
 
 static container_t rootContainer = nullptr;    /* the root container */
@@ -27,77 +27,80 @@ long long int instr_new_paje_id ()
 namespace simgrid {
 namespace instr {
 
-container_t Container::getRoot()
+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::getInstance()->getNetpointByNameOrNull(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_) {
-    type_ = father_->type_->getOrCreateContainerType(std::string("L") + std::to_string(level));
-    father_->children_.insert({getName(), this});
-    logCreation();
+    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});
+    log_creation();
   } else {
     type_         = new ContainerType("0");
     rootContainer = this;
   }
 }
 
-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::getInstance()->getNetpointByNameOrNull(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_->getName());
+  trivaNodeTypes.insert(type_->get_name());
 }
 
 HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
-    : Container::Container(host.getCname(), "HOST", father)
+    : Container::Container(host.get_name(), "HOST", father)
 {
   xbt_assert(father, "Only the Root container has no father");
 
   netpoint_ = host.pimpl_netpoint;
-  xbt_assert(netpoint_, "Element '%s' not found", host.getCname());
+  xbt_assert(netpoint_, "Element '%s' not found", host.get_cname());
 
-  trivaNodeTypes.insert(type_->getName());
+  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_->getOrCreateContainerType(type_name);
+      type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
       father_->children_.insert({name_, this});
-      logCreation();
+      log_creation();
     }
   }
 
   //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")
-    trivaNodeTypes.insert(type_->getName());
+    trivaNodeTypes.insert(type_->get_name());
 }
 
 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;
@@ -107,69 +110,69 @@ Container::~Container()
   TRACE_paje_dump_buffer(true);
 
   // trace my destruction, but not if user requests so or if the container is root
-  if (not TRACE_disable_destroy() && this != Container::getRoot())
-    logDestruction();
+  if (not TRACE_disable_destroy() && this != Container::get_root())
+    log_destruction();
 
   // remove me from the allContainers data structure
   allContainers.erase(name_);
 }
 
-void Container::createChild(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::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) ", getCname(), father_->getCname());
+    XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get_cname(), father_->get_cname());
     father_->children_.erase(name_);
   }
   delete this;
 }
 
-void Container::logCreation()
+void Container::log_creation()
 {
   double timestamp = SIMIX_get_clock();
   std::stringstream stream;
 
   XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_CreateContainer, timestamp);
 
-  if (instr_fmt_type == instr_fmt_paje) {
+  if (trace_format == simgrid::instr::TraceFormat::Paje) {
     stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_CreateContainer << " ";
-    /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
-    if (timestamp < 1e-12)
-      stream << 0;
+    stream << timestamp << " " << id_ << " " << type_->get_id() << " " << father_->id_ << " \"";
+    if (name_.find("rank-") != 0)
+      stream << name_ << "\"";
     else
-      stream << timestamp;
-    stream << " " << id_ << " " << type_->getId() << " " << father_->id_ << " \"" << name_ << "\"";
+      /* 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());
-    fprintf(tracing_file, "%s\n", stream.str().c_str());
-  } else if (instr_fmt_type == instr_fmt_TI) {
+    tracing_file << stream.str() << std::endl;
+  } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
     // if we are in the mode with only one file
-    static FILE* ti_unique_file = nullptr;
+    static std::ofstream* ti_unique_file = nullptr;
 
     if (tracing_files.empty()) {
       // generate unique run id with time
       prefix = xbt_os_time();
     }
 
-    if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) {
+    if (not simgrid::config::get_value<bool>("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) {
       std::string folder_name = TRACE_get_filename() + "_files";
       std::string filename    = folder_name + "/" + std::to_string(prefix) + "_" + name_ + ".txt";
 #ifdef WIN32
@@ -177,9 +180,9 @@ void Container::logCreation()
 #else
       mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
 #endif
-      ti_unique_file = fopen(filename.c_str(), "w");
-      xbt_assert(ti_unique_file, "Tracefile %s could not be opened for writing: %s", filename.c_str(), strerror(errno));
-      fprintf(tracing_file, "%s\n", filename.c_str());
+      ti_unique_file = new std::ofstream(filename.c_str(), std::ofstream::out);
+      xbt_assert(not ti_unique_file->fail(), "Tracefile %s could not be opened for writing", filename.c_str());
+      tracing_file << filename << std::endl;
     }
     tracing_files.insert({this, ti_unique_file});
   } else {
@@ -187,25 +190,22 @@ void Container::logCreation()
   }
 }
 
-void Container::logDestruction()
+void Container::log_destruction()
 {
   std::stringstream stream;
   double timestamp = SIMIX_get_clock();
 
   XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_DestroyContainer, timestamp);
 
-  if (instr_fmt_type == instr_fmt_paje) {
+  if (trace_format == simgrid::instr::TraceFormat::Paje) {
     stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DestroyContainer << " ";
-    /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */
-    if (timestamp < 1e-12)
-      stream << 0 << " " << type_->getId() << " " << id_;
-    else
-      stream << timestamp << " " << type_->getId() << " " << id_;
+    stream << timestamp << " " << type_->get_id() << " " << id_;
     XBT_DEBUG("Dump %s", stream.str().c_str());
-    fprintf(tracing_file, "%s\n", stream.str().c_str());
-  } else if (instr_fmt_type == instr_fmt_TI) {
-    if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) {
-      fclose(tracing_files.at(this));
+    tracing_file << stream.str() << std::endl;
+  } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
+    if (not simgrid::config::get_value<bool>("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) {
+      tracing_files.at(this)->close();
+      delete tracing_files.at(this);
     }
     tracing_files.erase(this);
   } else {
@@ -213,24 +213,24 @@ void Container::logDestruction()
   }
 }
 
-StateType* Container::getState(std::string name)
+StateType* Container::get_state(const std::string& name)
 {
-  StateType* ret = dynamic_cast<StateType*>(type_->byName(name));
-  ret->setCallingContainer(this);
+  StateType* ret = static_cast<StateType*>(type_->by_name(name));
+  ret->set_calling_container(this);
   return ret;
 }
 
-LinkType* Container::getLink(std::string name)
+LinkType* Container::get_link(const std::string& name)
 {
-  LinkType* ret = dynamic_cast<LinkType*>(type_->byName(name));
-  ret->setCallingContainer(this);
+  LinkType* ret = static_cast<LinkType*>(type_->by_name(name));
+  ret->set_calling_container(this);
   return ret;
 }
 
-VariableType* Container::getVariable(std::string name)
+VariableType* Container::get_variable(const std::string& name)
 {
-  VariableType* ret = dynamic_cast<VariableType*>(type_->byName(name));
-  ret->setCallingContainer(this);
+  VariableType* ret = static_cast<VariableType*>(type_->by_name(name));
+  ret->set_calling_container(this);
   return ret;
 }
 }