A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert last bits from the xbt/config C interface.
[simgrid.git]
/
src
/
instr
/
instr_paje_containers.cpp
diff --git
a/src/instr/instr_paje_containers.cpp
b/src/instr/instr_paje_containers.cpp
index
2f7a00f
..
8b29f80
100644
(file)
--- a/
src/instr/instr_paje_containers.cpp
+++ b/
src/instr/instr_paje_containers.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
8
. 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. */
/* 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. */
@@
-39,7
+39,7
@@
NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZone
xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
if (father_) {
type_ = father_->type_->getOrCreateContainerType(std::string("L") + std::to_string(level));
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({get
N
ame(), this});
+ father_->children_.insert({get
_n
ame(), this});
logCreation();
} else {
type_ = new ContainerType("0");
logCreation();
} else {
type_ = new ContainerType("0");
@@
-54,18
+54,18
@@
RouterContainer::RouterContainer(std::string name, Container* father) : Containe
netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
- trivaNodeTypes.insert(type_->get
N
ame());
+ trivaNodeTypes.insert(type_->get
_n
ame());
}
HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
}
HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
- : Container::Container(host.get
C
name(), "HOST", father)
+ : Container::Container(host.get
_c
name(), "HOST", father)
{
xbt_assert(father, "Only the Root container has no father");
netpoint_ = host.pimpl_netpoint;
{
xbt_assert(father, "Only the Root container has no father");
netpoint_ = host.pimpl_netpoint;
- xbt_assert(netpoint_, "Element '%s' not found", host.get
C
name());
+ xbt_assert(netpoint_, "Element '%s' not found", host.get
_c
name());
- trivaNodeTypes.insert(type_->get
N
ame());
+ trivaNodeTypes.insert(type_->get
_n
ame());
}
Container::Container(std::string name, std::string type_name, Container* father) : name_(name), father_(father)
}
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")
//register NODE types for triva configuration
if (type_name == "LINK")
- trivaNodeTypes.insert(type_->get
N
ame());
+ trivaNodeTypes.insert(type_->get
_n
ame());
}
Container::~Container()
}
Container::~Container()
@@
-137,7
+137,7
@@
Container* Container::byName(std::string name)
void Container::removeFromParent()
{
if (father_) {
void Container::removeFromParent()
{
if (father_) {
- XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get
Cname(), father_->getC
name());
+ XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", get
_cname(), father_->get_c
name());
father_->children_.erase(name_);
}
delete this;
father_->children_.erase(name_);
}
delete this;
@@
-150,17
+150,12
@@
void Container::logCreation()
XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_CreateContainer, timestamp);
XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_CreateContainer, timestamp);
- if (
instr_fmt_type == instr_fmt_p
aje) {
+ if (
trace_format == simgrid::instr::TraceFormat::P
aje) {
stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_CreateContainer << " ";
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());
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;
// if we are in the mode with only one file
static FILE* ti_unique_file = nullptr;
@@
-169,7
+164,7
@@
void Container::logCreation()
prefix = xbt_os_time();
}
prefix = xbt_os_time();
}
- if (not
xbt_cfg_get_boolean
("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) {
+ 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
std::string folder_name = TRACE_get_filename() + "_files";
std::string filename = folder_name + "/" + std::to_string(prefix) + "_" + name_ + ".txt";
#ifdef WIN32
@@
-194,17
+189,13
@@
void Container::logDestruction()
XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_DestroyContainer, timestamp);
XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, PAJE_DestroyContainer, timestamp);
- if (
instr_fmt_type == instr_fmt_p
aje) {
+ if (
trace_format == simgrid::instr::TraceFormat::P
aje) {
stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DestroyContainer << " ";
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());
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);
fclose(tracing_files.at(this));
}
tracing_files.erase(this);