-/* 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 <xbt/config.hpp>
+
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/instr/instr_private.hpp"
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");
netpoint_ = simgrid::s4u::Engine::getInstance()->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)
//register NODE types for triva configuration
if (type_name == "LINK")
- trivaNodeTypes.insert(type_->getName());
+ trivaNodeTypes.insert(type_->get_name());
}
Container::~Container()
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);
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()
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) {
+ } else if (trace_format == simgrid::instr::TraceFormat::Ti) {
// if we are in the mode with only one file
static FILE* ti_unique_file = nullptr;
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 = 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 {
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) {
+ } 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) {
fclose(tracing_files.at(this));
}
tracing_files.erase(this);
