X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7adf7d3cc45bf13462b257c7e3bc8a2eae2bf981..403af5e6247ce6452b721f418a5b41e4548efac4:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 2b16c72199..ce66709c40 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -6,8 +6,6 @@ #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)"); @@ -16,7 +14,7 @@ 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 */ +static std::map allContainers; /* all created containers indexed by name */ std::set trivaNodeTypes; /* all host types defined */ std::set trivaEdgeTypes; /* all link types defined */ @@ -29,7 +27,7 @@ long long int instr_new_paje_id () namespace simgrid { namespace instr { -container_t Container::getRootContainer() +container_t Container::getRoot() { return rootContainer; } @@ -44,7 +42,7 @@ NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZone father_->children_.insert({getName(), this}); logCreation(); } else { - type_ = Type::createRootType(); + type_ = new ContainerType("0"); rootContainer = this; } } @@ -87,9 +85,8 @@ Container::Container(std::string name, std::string type_name, Container* father) } //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()); @@ -102,19 +99,16 @@ 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_last_timestamp_to_dump = SIMIX_get_clock(); TRACE_paje_dump_buffer(true); - // trace my destruction - if (not TRACE_disable_destroy() && this != Container::getRootContainer()) { - // 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_); @@ -138,7 +132,7 @@ 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) ", getCname(), father_->getCname()); father_->children_.erase(name_); } } @@ -148,22 +142,18 @@ void Container::logCreation() double timestamp = SIMIX_get_clock(); std::stringstream stream; - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, simgrid::instr::PAJE_CreateContainer, timestamp); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, PAJE_CreateContainer, timestamp); if (instr_fmt_type == instr_fmt_paje) { - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << simgrid::instr::PAJE_CreateContainer; - stream << " "; + 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; else stream << timestamp; - stream << " " << id_ << " " << type_->getId() << " " << father_->id_ << " \"" << name_ << "\"" << std::endl; - fprintf(tracing_file, "%s", stream.str().c_str()); + stream << " " << id_ << " " << type_->getId() << " " << father_->id_ << " \"" << name_ << "\""; XBT_DEBUG("Dump %s", stream.str().c_str()); - stream.str(""); - stream.clear(); + fprintf(tracing_file, "%s\n", stream.str().c_str()); } else if (instr_fmt_type == instr_fmt_TI) { // if we are in the mode with only one file static FILE* ti_unique_file = nullptr; @@ -174,19 +164,16 @@ void Container::logCreation() } 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()); + 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 = 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()); } tracing_files.insert({this, ti_unique_file}); } else { @@ -199,31 +186,46 @@ void Container::logDestruction() std::stringstream stream; double timestamp = SIMIX_get_clock(); - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, simgrid::instr::PAJE_DestroyContainer, timestamp); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, PAJE_DestroyContainer, timestamp); if (instr_fmt_type == instr_fmt_paje) { - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << simgrid::instr::PAJE_DestroyContainer; - stream << " "; + 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; + stream << 0 << " " << type_->getId() << " " << id_; else - stream << timestamp; - stream << " " << type_->getId() << " " << id_ << std::endl; - fprintf(tracing_file, "%s", stream.str().c_str()); + stream << timestamp << " " << type_->getId() << " " << id_; XBT_DEBUG("Dump %s", stream.str().c_str()); - stream.str(""); - stream.clear(); + 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) { - FILE* f = tracing_files.at(this); - fclose(f); + fclose(tracing_files.at(this)); } tracing_files.erase(this); } else { THROW_IMPOSSIBLE; } } + +StateType* Container::getState(std::string name) +{ + StateType* ret = dynamic_cast(type_->byName(name)); + ret->setCallingContainer(this); + return ret; +} + +LinkType* Container::getLink(std::string name) +{ + LinkType* ret = dynamic_cast(type_->byName(name)); + ret->setCallingContainer(this); + return ret; +} + +VariableType* Container::getVariable(std::string name) +{ + VariableType* ret = dynamic_cast(type_->byName(name)); + ret->setCallingContainer(this); + return ret; +} } }