X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/064b14e9ad70077e74cbc8ce42d4925f80d76ed4..0ff40b115c4a7f131b2ffab880faf600e96cfc06:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index c449a97006..3316dbd057 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -5,13 +5,16 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "surf/surf.h" #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 +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 */ std::set trivaNodeTypes; /* all host types defined */ @@ -37,101 +40,74 @@ namespace simgrid { namespace instr { Container::Container(std::string name, e_container_types kind, Container* father) - : name_(name), kind_(kind), father_(father) + : kind_(kind), name_(name), father_(father) { static long long int container_id = 0; id_ = std::to_string(container_id); // id (or alias) of the container container_id++; - //Search for network_element_t - switch (kind){ - case INSTR_HOST: - this->netpoint_ = sg_host_by_name(name.c_str())->pimpl_netpoint; - xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str()); + 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: - this->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); - xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str()); + netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); + xbt_assert(netpoint_, "Element '%s' not found", name.c_str()); + typeNameBuff = std::string("ROUTER"); break; - case INSTR_AS: - this->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); - xbt_assert(this->netpoint_, "Element '%s' not found", name.c_str()); + 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: - this->netpoint_ = nullptr; + THROWF(tracing_error, 0, "new container kind is unknown."); break; } if (father_) { - this->level_ = father_->level_ + 1; - XBT_DEBUG("new container %s, child of %s", name.c_str(), father->name_.c_str()); - } - - // type definition (method depends on kind of this new container) - if (this->kind_ == INSTR_AS) { - //if this container is of an AS, its type name depends on its level - char as_typename[INSTR_DEFAULT_STR_SIZE]; - snprintf(as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", this->level_); - if (this->father_) { - this->type_ = this->father_->type_->getChildOrNull(as_typename); - if (this->type_ == nullptr) { - this->type_ = Type::containerNew(as_typename, this->father_->type_); - } - }else{ - this->type_ = Type::containerNew("0", nullptr); - } - } else { - //otherwise, the name is its kind - char typeNameBuff[INSTR_DEFAULT_STR_SIZE]; - switch (this->kind_) { - case INSTR_HOST: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "HOST"); - break; - case INSTR_LINK: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "LINK"); - break; - case INSTR_ROUTER: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "ROUTER"); - break; - case INSTR_SMPI: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MPI"); - break; - case INSTR_MSG_PROCESS: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_PROCESS"); - break; - case INSTR_MSG_VM: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_VM"); - break; - case INSTR_MSG_TASK: - snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_TASK"); - break; - default: - THROWF (tracing_error, 0, "new container kind is unknown."); - break; - } - Type* type = this->father_->type_->getChildOrNull(typeNameBuff); - if (type == nullptr){ - this->type_ = Type::containerNew(typeNameBuff, this->father_->type_); - }else{ - this->type_ = type; - } - } - if (this->father_) { - this->father_->children_.insert({this->name_, this}); - LogContainerCreation(this); + type_ = father_->type_->getOrCreateContainerType(typeNameBuff); + father_->children_.insert({name_, this}); + logCreation(); + } else if (kind_ == INSTR_AS) { + type_ = Type::createRootType(); } //register all kinds by name - if (not allContainers.emplace(this->name_, this).second) { - THROWF(tracing_error, 1, "container %s already present in allContainers data structure", this->name_.c_str()); + 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'", this->name_.c_str()); + XBT_DEBUG("Add container name '%s'", name_.c_str()); //register NODE types for triva configuration - if (this->kind_ == INSTR_HOST || this->kind_ == INSTR_LINK || this->kind_ == INSTR_ROUTER) { - trivaNodeTypes.insert(this->type_->getName()); - } + if (kind_ == INSTR_HOST || kind_ == INSTR_LINK || kind_ == INSTR_ROUTER) + trivaNodeTypes.insert(type_->getName()); } Container::~Container() @@ -144,12 +120,12 @@ Container::~Container() // 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_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 - LogContainerDestruction(this); + logDestruction(); } // remove me from the allContainers data structure @@ -178,5 +154,89 @@ void Container::removeFromParent() father_->children_.erase(name_); } } + +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("Dump %s", stream.str().c_str()); + stream.str(""); + stream.clear(); + } else if (instr_fmt_type == instr_fmt_TI) { + // if we are in the mode with only one file + static FILE* 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()); +#ifdef WIN32 + _mkdir(folder_name); +#else + mkdir(folder_name, 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); + } + + tracing_files.insert({this, ti_unique_file}); + } else { + THROW_IMPOSSIBLE; + } +} + +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("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_files.erase(this); + } else { + THROW_IMPOSSIBLE; + } +} } }