-/* 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. */
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/instr/instr_private.hpp"
-#include "surf/surf.h"
-#include <unordered_map>
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 */
-static std::unordered_map<std::string, container_t> allContainers; /* all created containers indexed by name */
+static std::map<std::string, container_t> allContainers; /* all created containers indexed by name */
std::set<std::string> trivaNodeTypes; /* all host types defined */
std::set<std::string> trivaEdgeTypes; /* all link types defined */
namespace simgrid {
namespace instr {
-container_t Container::getRootContainer()
+container_t Container::get_root()
{
return rootContainer;
}
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()->netpoint_by_name_or_null(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});
- 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_ = Type::createRootType();
+ type_ = new ContainerType("0");
rootContainer = this;
}
}
{
xbt_assert(father, "Only the Root container has no father");
- netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+ netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(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)
XBT_DEBUG("new container %s, child of %s", name.c_str(), father->name_.c_str());
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) {
+ 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 (type_name == "LINK")
- trivaNodeTypes.insert(type_->getName());
+ 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_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
- logDestruction();
- }
+ // trace my destruction, but not if user requests so or if the container is root
+ if (not TRACE_disable_destroy() && this != Container::get_root())
+ log_destruction();
// remove me from the allContainers data structure
allContainers.erase(name_);
}
-Container* Container::byNameOrNull(std::string name)
+void Container::create_child(std::string name, std::string type_name)
+{
+ new Container(name, type_name, this);
+}
+
+Container* Container::by_name_or_null(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(std::string name)
{
- Container* ret = Container::byNameOrNull(name);
+ Container* ret = Container::by_name_or_null(name);
if (ret == nullptr)
THROWF(tracing_error, 1, "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) ", 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()
+void Container::log_creation()
{
double timestamp = SIMIX_get_clock();
std::stringstream stream;
- XBT_DEBUG("%s: event_type=%u, 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<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
- _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 {
}
}
-void Container::logDestruction()
+void Container::log_destruction()
{
std::stringstream stream;
double timestamp = SIMIX_get_clock();
- XBT_DEBUG("%s: event_type=%u, 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<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 {
}
}
-StateType* Container::getState(std::string name)
+StateType* Container::get_state(std::string name)
+{
+ StateType* ret = dynamic_cast<StateType*>(type_->by_name(name));
+ ret->set_calling_container(this);
+ return ret;
+}
+
+LinkType* Container::get_link(std::string name)
+{
+ LinkType* ret = dynamic_cast<LinkType*>(type_->by_name(name));
+ ret->set_calling_container(this);
+ return ret;
+}
+
+VariableType* Container::get_variable(std::string name)
{
- StateType* ret = dynamic_cast<StateType*>(type_->byName(name));
- ret->setCallingContainer(this);
+ VariableType* ret = dynamic_cast<VariableType*>(type_->by_name(name));
+ ret->set_calling_container(this);
return ret;
}
}
