X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e264fe1aa6b202a19da894d62e3db1f2db75581..88d8c7a64ca458f3e1a81fa3653eba880ae71fed:/src/instr/instr_paje_containers.cpp diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index e5342cfd51..2cea47fa07 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. */ @@ -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 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 */ @@ -27,7 +27,7 @@ long long int instr_new_paje_id () namespace simgrid { namespace instr { -container_t Container::getRootContainer() +container_t Container::getRoot() { return rootContainer; } @@ -35,11 +35,11 @@ container_t Container::getRootContainer() NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father) : Container::Container(name, "", father) { - netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); + netpoint_ = simgrid::s4u::Engine::get_instance()->getNetpointByNameOrNull(name); xbt_assert(netpoint_, "Element '%s' not found", name.c_str()); if (father_) { type_ = father_->type_->getOrCreateContainerType(std::string("L") + std::to_string(level)); - father_->children_.insert({getName(), this}); + father_->children_.insert({get_name(), this}); logCreation(); } else { type_ = new ContainerType("0"); @@ -51,21 +51,21 @@ RouterContainer::RouterContainer(std::string name, Container* father) : Containe { xbt_assert(father, "Only the Root container has no father"); - netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name); + netpoint_ = simgrid::s4u::Engine::get_instance()->getNetpointByNameOrNull(name); xbt_assert(netpoint_, "Element '%s' not found", name.c_str()); - 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_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.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) @@ -92,7 +92,7 @@ Container::Container(std::string name, std::string type_name, Container* father) //register NODE types for triva configuration if (type_name == "LINK") - trivaNodeTypes.insert(type_->getName()); + trivaNodeTypes.insert(type_->get_name()); } Container::~Container() @@ -107,13 +107,18 @@ 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::getRootContainer()) + 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); @@ -132,9 +137,10 @@ Container* Container::byName(std::string name) void Container::removeFromParent() { 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() @@ -142,41 +148,33 @@ void Container::logCreation() double timestamp = SIMIX_get_clock(); std::stringstream stream; - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, PAJE_CreateContainer, timestamp); + 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; - else - stream << timestamp; - stream << " " << id_ << " " << type_->getId() << " " << father_->id_ << " \"" << name_ << "\""; + stream << timestamp << " " << id_ << " " << type_->get_id() << " " << father_->id_ << " \"" << name_ << "\""; 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) { - 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 { @@ -189,20 +187,17 @@ void Container::logDestruction() std::stringstream stream; double timestamp = SIMIX_get_clock(); - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, PAJE_DestroyContainer, timestamp); + 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("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 { @@ -219,7 +214,9 @@ StateType* Container::getState(std::string name) LinkType* Container::getLink(std::string name) { - return dynamic_cast(type_->byName(name)); + LinkType* ret = dynamic_cast(type_->byName(name)); + ret->setCallingContainer(this); + return ret; } VariableType* Container::getVariable(std::string name)