X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92197c7e3516470da6ccee2253d0e515a70a70a9..92cbaa683aa7824d7ad1b7f1702dec27e1c6eefb:/src/instr/instr_paje_types.cpp diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp index 952af67936..ff0c4b5b72 100644 --- a/src/instr/instr_paje_types.cpp +++ b/src/instr/instr_paje_types.cpp @@ -1,4 +1,4 @@ -/* 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 @@ -9,142 +9,143 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)"); extern std::ofstream tracing_file; +// to check if variables were previously set to 0, otherwise paje won't simulate them +static std::set platform_variables; namespace simgrid { namespace instr { -Type::Type(std::string name, std::string alias, std::string color, Type* father) +Type::Type(const std::string& name, const std::string& alias, const std::string& color, Type* father) : id_(instr_new_paje_id()), name_(name), color_(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_[alias].reset(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()); } } -Type::~Type() -{ - for (auto elm : children_) - delete elm.second; -} - -ValueType::~ValueType() -{ - for (auto elm : values_) - 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()); - logDefinition(PAJE_DefineContainerType); + log_definition(PAJE_DefineContainerType); } -EventType::EventType(std::string name, Type* father) : ValueType(name, father) +EventType::EventType(const std::string& name, Type* father) : ValueType(name, father) { XBT_DEBUG("EventType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id()); - logDefinition(PAJE_DefineEventType); + log_definition(PAJE_DefineEventType); } -StateType::StateType(std::string name, Type* father) : ValueType(name, father) +StateType::StateType(const std::string& name, Type* father) : ValueType(name, father) { XBT_DEBUG("StateType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id()); - logDefinition(PAJE_DefineStateType); + log_definition(PAJE_DefineStateType); } -StateType::~StateType() +void StateType::set_event(const std::string& value_name) { - events_.clear(); + events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, get_entity_value(value_name), nullptr)); } -void StateType::setEvent(std::string value_name) +void StateType::push_event(const std::string& value_name, TIData* extra) { - events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, getEntityValue(value_name), nullptr)); + events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, get_entity_value(value_name), extra)); } -void StateType::pushEvent(std::string value_name, TIData* extra) +void StateType::push_event(const std::string& value_name) { - events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, getEntityValue(value_name), extra)); + events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, get_entity_value(value_name), nullptr)); } -void StateType::pushEvent(std::string value_name) +void StateType::pop_event() { - events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, getEntityValue(value_name), nullptr)); + pop_event(nullptr); } -void StateType::popEvent() -{ - events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr, nullptr)); -} - -void StateType::popEvent(TIData* extra) +void StateType::pop_event(TIData* extra) { 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, const std::string& color, Type* father) + : Type(name, name, color, father) { XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id()); - logDefinition(PAJE_DefineVariableType); + log_definition(PAJE_DefineVariableType); } -VariableType::~VariableType() +void VariableType::instr_event(double now, double delta, const char* resource, double value) { - events_.clear(); + /* To trace resource utilization, we use AddEvent and SubEvent only. This implies to add a SetEvent first to set the + * initial value of all variables for subsequent adds/subs. If we don't do so, the first AddEvent would be added to a + * non-determined value, hence causing analysis problems. + */ + + // create a key considering the resource and variable + std::string key = std::string(resource) + get_name(); + + // check if key exists: if it doesn't, set the variable to zero and mark this in the global map. + if (platform_variables.find(key) == platform_variables.end()) { + set_event(now, 0); + platform_variables.insert(key); + } + + add_event(now, value); + sub_event(now + delta, value); } -void VariableType::setEvent(double timestamp, double value) +void VariableType::set_event(double timestamp, double value) { events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SetVariable, value)); } -void VariableType::addEvent(double timestamp, double value) +void VariableType::add_event(double timestamp, double value) { events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_AddVariable, value)); } -void VariableType::subEvent(double timestamp, double value) +void VariableType::sub_event(double timestamp, double value) { 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(const std::string& name, const std::string& alias, Type* father) : ValueType(name, alias, father) { } -void LinkType::startEvent(Container* startContainer, std::string value, std::string key) +void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key) { - startEvent(startContainer, value, key, -1); + start_event(startContainer, value, key, -1); } -void LinkType::startEvent(Container* startContainer, std::string value, std::string key, int size) +void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key, int size) { new LinkEvent(issuer_, this, PAJE_StartLink, startContainer, value, key, size); } -void LinkType::endEvent(Container* endContainer, std::string value, std::string key) +void LinkType::end_event(Container* endContainer, const std::string& value, const std::string& key) { new LinkEvent(issuer_, this, PAJE_EndLink, endContainer, value, key, -1); } -void Type::logDefinition(e_event_type event_type) +void Type::log_definition(e_event_type event_type) { if (trace_format != simgrid::instr::TraceFormat::Paje) return; XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, event_type, TRACE_precision(), 0.); stream_ << event_type << " " << get_id() << " " << father_->get_id() << " " << get_name(); - if (isColored()) + if (is_colored()) stream_ << " \"" << color_ << "\""; XBT_DEBUG("Dump %s", stream_.str().c_str()); tracing_file << stream_.str() << std::endl; } -void Type::logDefinition(simgrid::instr::Type* source, simgrid::instr::Type* dest) +void Type::log_definition(simgrid::instr::Type* source, simgrid::instr::Type* dest) { if (trace_format != simgrid::instr::TraceFormat::Paje) return; @@ -155,15 +156,15 @@ void Type::logDefinition(simgrid::instr::Type* source, simgrid::instr::Type* des tracing_file << stream_.str() << std::endl; } -Type* Type::byName(std::string name) +Type* Type::by_name(const std::string& name) { Type* ret = nullptr; - for (auto elm : children_) { + for (auto const& elm : children_) { if (elm.second->name_ == name) { if (ret != nullptr) { THROWF (tracing_error, 0, "there are two children types with the same name?"); } else { - ret = elm.second; + ret = elm.second.get(); } } } @@ -172,60 +173,42 @@ Type* Type::byName(std::string name) return ret; } -void ValueType::addEntityValue(std::string name) +void ValueType::add_entity_value(const std::string& name) { - addEntityValue(name, ""); + add_entity_value(name, ""); } -void ValueType::addEntityValue(std::string name, std::string color) +void ValueType::add_entity_value(const std::string& name, const 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); - values_.insert({name, new_val}); + auto res = values_.emplace(name, EntityValue(name, color, this)); XBT_DEBUG("new value %s, child of %s", name.c_str(), get_cname()); - new_val->print(); + res.first->second.print(); } } -EntityValue* ValueType::getEntityValue(std::string name) +EntityValue* ValueType::get_entity_value(const std::string& name) { auto ret = values_.find(name); if (ret == values_.end()) { THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), get_cname()); } - return ret->second; -} - -ContainerType* Type::getOrCreateContainerType(std::string name) -{ - auto cont = children_.find(name); - return cont == children_.end() ? new ContainerType(name, this) : static_cast(cont->second); -} - -EventType* Type::getOrCreateEventType(std::string name) -{ - auto cont = children_.find(name); - return cont == children_.end() ? new EventType(name, this) : static_cast(cont->second); -} - -StateType* Type::getOrCreateStateType(std::string name) -{ - auto cont = children_.find(name); - return cont == children_.end() ? new StateType(name, this) : static_cast(cont->second); + return &ret->second; } -VariableType* Type::getOrCreateVariableType(std::string name, std::string color) +VariableType* Type::by_name_or_create(const std::string& name, const 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(cont->second); + return cont == children_.end() ? new VariableType(name, mycolor, this) + : static_cast(cont->second.get()); } -LinkType* Type::getOrCreateLinkType(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); @@ -233,10 +216,10 @@ LinkType* Type::getOrCreateLinkType(std::string name, Type* source, Type* dest) LinkType* ret = new LinkType(name, alias, this); XBT_DEBUG("LinkType %s(%lld), child of %s(%lld) %s(%lld)->%s(%lld)", ret->get_cname(), ret->get_id(), get_cname(), get_id(), source->get_cname(), source->get_id(), dest->get_cname(), dest->get_id()); - ret->logDefinition(source, dest); + ret->log_definition(source, dest); return ret; } else - return static_cast(it->second); + return static_cast(it->second.get()); } } }