-/* Copyright (c) 2012-2018. The SimGrid Team.
+/* Copyright (c) 2012-2019. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
namespace instr {
Type::Type(std::string name, std::string alias, std::string color, Type* father)
- : id_(instr_new_paje_id()), name_(name), color_(color), father_(father)
+ : id_(instr_new_paje_id()), name_(std::move(name)), color_(std::move(color)), father_(father)
{
- if (name.empty() || alias.empty())
+ if (name_.empty() || alias.empty())
THROWF(tracing_error, 0, "can't create a new type with no name or alias");
if (father != nullptr){
- father->children_.insert({alias, this});
- XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->get_cname());
+ father->children_.insert({std::move(alias), this});
+ XBT_DEBUG("new type %s, child of %s", get_cname(), father->get_cname());
}
if (trace_format == simgrid::instr::TraceFormat::Paje) {
stream_ << std::fixed << std::setprecision(TRACE_precision());
delete elm.second;
}
-ContainerType::ContainerType(std::string name, Type* father) : Type(name, name, "", father)
+ContainerType::ContainerType(const std::string& name, Type* father) : Type(name, name, "", father)
{
XBT_DEBUG("ContainerType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
log_definition(PAJE_DefineContainerType);
}
-EventType::EventType(std::string name, Type* father) : ValueType(name, father)
+EventType::EventType(std::string name, Type* father) : ValueType(std::move(name), father)
{
XBT_DEBUG("EventType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
log_definition(PAJE_DefineEventType);
}
-StateType::StateType(std::string name, Type* father) : ValueType(name, father)
+StateType::StateType(std::string name, Type* father) : ValueType(std::move(name), father)
{
XBT_DEBUG("StateType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
log_definition(PAJE_DefineStateType);
events_.clear();
}
-void StateType::set_event(std::string value_name)
+void StateType::set_event(const std::string& value_name)
{
events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, get_entity_value(value_name), nullptr));
}
-void StateType::push_event(std::string value_name, TIData* extra)
+void StateType::push_event(const std::string& value_name, TIData* extra)
{
events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, get_entity_value(value_name), extra));
}
-void StateType::push_event(std::string value_name)
+void StateType::push_event(const std::string& value_name)
{
events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, get_entity_value(value_name), nullptr));
}
events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr, extra));
}
-VariableType::VariableType(std::string name, std::string color, Type* father) : Type(name, name, color, father)
+VariableType::VariableType(const std::string& name, std::string color, Type* father)
+ : Type(name, name, std::move(color), father)
{
XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
log_definition(PAJE_DefineVariableType);
events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SubVariable, value));
}
-LinkType::LinkType(std::string name, std::string alias, Type* father) : ValueType(name, alias, father)
+LinkType::LinkType(std::string name, std::string alias, Type* father)
+ : ValueType(std::move(name), std::move(alias), father)
{
}
void LinkType::start_event(Container* startContainer, std::string value, std::string key)
{
- start_event(startContainer, value, key, -1);
+ start_event(startContainer, value, std::move(key), -1);
}
void LinkType::start_event(Container* startContainer, std::string value, std::string key, int size)
{
- new LinkEvent(issuer_, this, PAJE_StartLink, startContainer, value, key, size);
+ new LinkEvent(issuer_, this, PAJE_StartLink, startContainer, value, std::move(key), size);
}
void LinkType::end_event(Container* endContainer, std::string value, std::string key)
{
- new LinkEvent(issuer_, this, PAJE_EndLink, endContainer, value, key, -1);
+ new LinkEvent(issuer_, this, PAJE_EndLink, endContainer, value, std::move(key), -1);
}
void Type::log_definition(e_event_type event_type)
tracing_file << stream_.str() << std::endl;
}
-Type* Type::by_name(std::string name)
+Type* Type::by_name(const std::string& name)
{
Type* ret = nullptr;
for (auto elm : children_) {
return ret;
}
-void ValueType::add_entity_value(std::string name)
+void ValueType::add_entity_value(const std::string& name)
{
add_entity_value(name, "");
}
-void ValueType::add_entity_value(std::string name, std::string color)
+void ValueType::add_entity_value(const std::string& name, std::string color)
{
if (name.empty())
THROWF(tracing_error, 0, "can't get a value with no name");
auto it = values_.find(name);
if (it == values_.end()) {
- EntityValue* new_val = new EntityValue(name, color, this);
+ EntityValue* new_val = new EntityValue(name, std::move(color), this);
values_.insert({name, new_val});
XBT_DEBUG("new value %s, child of %s", name.c_str(), get_cname());
new_val->print();
}
}
-EntityValue* ValueType::get_entity_value(std::string name)
+EntityValue* ValueType::get_entity_value(const std::string& name)
{
auto ret = values_.find(name);
if (ret == values_.end()) {
return ret->second;
}
-VariableType* Type::by_name_or_create(std::string name, std::string color)
+VariableType* Type::by_name_or_create(const std::string& name, std::string color)
{
auto cont = children_.find(name);
- std::string mycolor = color.empty() ? "1 1 1" : color;
- return cont == children_.end() ? new VariableType(name, mycolor, this) : static_cast<VariableType*>(cont->second);
+ std::string mycolor = color.empty() ? "1 1 1" : std::move(color);
+ return cont == children_.end() ? new VariableType(name, std::move(mycolor), this)
+ : static_cast<VariableType*>(cont->second);
}
-LinkType* Type::by_name_or_create(std::string name, Type* source, Type* dest)
+LinkType* Type::by_name_or_create(const std::string& name, Type* source, Type* dest)
{
std::string alias = name + "-" + std::to_string(source->id_) + "-" + std::to_string(dest->id_);
auto it = children_.find(alias);