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 */
namespace simgrid {
namespace instr {
-container_t Container::getRoot()
+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));
+ 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});
- logCreation();
+ log_creation();
} else {
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_->get_name());
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();
}
}
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::getRoot())
- logDestruction();
+ if (not TRACE_disable_destroy() && this != Container::get_root())
+ log_destruction();
// remove me from the allContainers data structure
allContainers.erase(name_);
}
-void Container::createChild(std::string name, std::string type_name)
+void Container::create_child(std::string name, std::string type_name)
{
new Container(name, type_name, this);
}
-Container* Container::byNameOrNull(std::string name)
+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);
- if (ret == nullptr)
- THROWF(tracing_error, 1, "container with name %s not found", name.c_str());
+ Container* ret = Container::by_name_or_null(name);
+ xbt_assert(ret != nullptr, "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) ", get_cname(), father_->get_cname());
delete this;
}
-void Container::logCreation()
+void Container::log_creation()
{
double timestamp = SIMIX_get_clock();
std::stringstream stream;
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());
- fprintf(tracing_file, "%s\n", stream.str().c_str());
+ 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) {
+ 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
#else
mkdir(folder_name.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
#endif
- 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());
+ 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();
stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DestroyContainer << " ";
stream << timestamp << " " << type_->get_id() << " " << id_;
XBT_DEBUG("Dump %s", stream.str().c_str());
- fprintf(tracing_file, "%s\n", stream.str().c_str());
+ tracing_file << stream.str() << std::endl;
} else if (trace_format == simgrid::instr::TraceFormat::Ti) {
- if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) {
- fclose(tracing_files.at(this));
+ 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_->byName(name));
- ret->setCallingContainer(this);
+ StateType* ret = dynamic_cast<StateType*>(type_->by_name(name));
+ ret->set_calling_container(this);
return ret;
}
-LinkType* Container::getLink(std::string name)
+LinkType* Container::get_link(std::string name)
{
- LinkType* ret = dynamic_cast<LinkType*>(type_->byName(name));
- ret->setCallingContainer(this);
+ LinkType* ret = dynamic_cast<LinkType*>(type_->by_name(name));
+ ret->set_calling_container(this);
return ret;
}
-VariableType* Container::getVariable(std::string name)
+VariableType* Container::get_variable(std::string name)
{
- VariableType* ret = dynamic_cast<VariableType*>(type_->byName(name));
- ret->setCallingContainer(this);
+ VariableType* ret = dynamic_cast<VariableType*>(type_->by_name(name));
+ ret->set_calling_container(this);
return ret;
}
}
