X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9d62905a9c7ddccca81ac0b1b51677b8798026ca..8d9283f70767d924231914c13674153d4b90a168:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index abf732b4ad..f5428d8a31 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-2018. 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,17 +6,15 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "src/instr/instr_private.hpp" -#include "surf/surf.h" -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)"); -extern FILE* tracing_file; -extern std::map tracing_files; // TI specific +extern std::ofstream tracing_file; +std::map tracing_files; // TI specific double prefix = 0.0; // TI specific static container_t rootContainer = nullptr; /* the root container */ -static std::unordered_map allContainers; /* all created containers indexed by name */ +static std::map allContainers; /* all created containers indexed by name */ std::set trivaNodeTypes; /* all host types defined */ std::set trivaEdgeTypes; /* all link types defined */ @@ -26,115 +24,102 @@ long long int instr_new_paje_id () return type_id++; } -container_t PJ_container_get_root() +namespace simgrid { +namespace instr { + +container_t Container::getRoot() { return rootContainer; } -void PJ_container_set_root (container_t root) +NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father) + : Container::Container(name, "", father) { - rootContainer = root; + netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name); + xbt_assert(netpoint_, "Element '%s' not found", name.c_str()); + if (father_) { + std::string type_name = std::string("L") + std::to_string(level); + type_ = father_->type_->by_name_or_create(type_name); + father_->children_.insert({get_name(), this}); + logCreation(); + } else { + type_ = new ContainerType("0"); + rootContainer = this; + } } -namespace simgrid { -namespace instr { +RouterContainer::RouterContainer(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()); -Container::Container(std::string name, e_container_types kind, Container* father) - : kind_(kind), name_(name), father_(father) + trivaNodeTypes.insert(type_->get_name()); +} + +HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father) + : Container::Container(host.get_cname(), "HOST", father) +{ + xbt_assert(father, "Only the Root container has no father"); + + netpoint_ = host.pimpl_netpoint; + xbt_assert(netpoint_, "Element '%s' not found", host.get_cname()); + + trivaNodeTypes.insert(type_->get_name()); +} + +Container::Container(std::string name, 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; - } - 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(type_name); + father_->children_.insert({name_, this}); + logCreation(); } - father_->children_.insert({name_, this}); - logCreation(); - } else if (kind_ == INSTR_AS) { - type_ = Type::containerNew("0", nullptr); } //register all kinds by name - if (not allContainers.emplace(name_, this).second) { + if (not allContainers.emplace(name_, this).second) THROWF(tracing_error, 1, "container %s already present in allContainers data structure", name_.c_str()); - } 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()); + if (type_name == "LINK") + trivaNodeTypes.insert(type_->get_name()); } Container::~Container() { XBT_DEBUG("destroy container %s", name_.c_str()); // Begin with destroying my own children - for (auto child : children_) { + for (auto child : children_) delete child.second; - } // 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_last_timestamp_to_dump = SIMIX_get_clock(); + TRACE_paje_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 + // trace my destruction, but not if user requests so or if the container is root + if (not TRACE_disable_destroy() && this != Container::getRoot()) logDestruction(); - } // remove me from the allContainers data structure allContainers.erase(name_); } +void Container::createChild(std::string name, std::string type_name) +{ + new Container(name, type_name, this); +} + Container* Container::byNameOrNull(std::string name) { auto cont = allContainers.find(name); @@ -153,9 +138,10 @@ Container* Container::byName(std::string name) void Container::removeFromParent() { 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; } void Container::logCreation() @@ -163,47 +149,34 @@ void Container::logCreation() double timestamp = SIMIX_get_clock(); std::stringstream stream; - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, simgrid::instr::PAJE_CreateContainer, timestamp); - - if (instr_fmt_type == instr_fmt_paje) { - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << simgrid::instr::PAJE_CreateContainer; - stream << " "; - /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */ - if (timestamp < 1e-12) - stream << 0; - else - stream << timestamp; - stream << " " << id_ << " " << type_->getId() << " " << father_->id_ << " \"" << name_ << "\"" << std::endl; - fprintf(tracing_file, "%s", stream.str().c_str()); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_CreateContainer, timestamp); + + 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_ << "\""; XBT_DEBUG("Dump %s", stream.str().c_str()); - stream.str(""); - stream.clear(); - } 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) { - char* folder_name = bprintf("%s_files", TRACE_get_filename()); - char* filename = bprintf("%s/%f_%s.txt", folder_name, prefix, name_.c_str()); + if (not simgrid::config::get_value("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 - _mkdir(folder_name); + _mkdir(folder_name.c_str()); #else - mkdir(folder_name, S_IRWXU | S_IRWXG | S_IRWXO); + mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); #endif - ti_unique_file = fopen(filename, "w"); - xbt_assert(ti_unique_file, "Tracefile %s could not be opened for writing: %s", filename, strerror(errno)); - fprintf(tracing_file, "%s\n", filename); - - xbt_free(folder_name); - xbt_free(filename); + 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 { THROW_IMPOSSIBLE; @@ -215,31 +188,43 @@ void Container::logDestruction() std::stringstream stream; double timestamp = SIMIX_get_clock(); - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, simgrid::instr::PAJE_DestroyContainer, timestamp); - - if (instr_fmt_type == instr_fmt_paje) { - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << simgrid::instr::PAJE_DestroyContainer; - stream << " "; - /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */ - if (timestamp < 1e-12) - stream << 0; - else - stream << timestamp; - stream << " " << type_->getId() << " " << id_ << std::endl; - fprintf(tracing_file, "%s", stream.str().c_str()); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_DestroyContainer, timestamp); + + if (trace_format == simgrid::instr::TraceFormat::Paje) { + stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DestroyContainer << " "; + stream << timestamp << " " << type_->get_id() << " " << id_; XBT_DEBUG("Dump %s", stream.str().c_str()); - stream.str(""); - stream.clear(); - } else if (instr_fmt_type == instr_fmt_TI) { - if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) { - FILE* f = tracing_files.at(this); - fclose(f); + tracing_file << stream.str() << std::endl; + } else if (trace_format == simgrid::instr::TraceFormat::Ti) { + if (not simgrid::config::get_value("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 { THROW_IMPOSSIBLE; } } + +StateType* Container::getState(std::string name) +{ + StateType* ret = dynamic_cast(type_->by_name(name)); + ret->setCallingContainer(this); + return ret; +} + +LinkType* Container::getLink(std::string name) +{ + LinkType* ret = dynamic_cast(type_->by_name(name)); + ret->setCallingContainer(this); + return ret; +} + +VariableType* Container::getVariable(std::string name) +{ + VariableType* ret = dynamic_cast(type_->by_name(name)); + ret->setCallingContainer(this); + return ret; +} } }