-/* 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. */
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) {
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) {
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) {
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) {