X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95b307c99d462730e4e813f1343112021123d92e..cf6a1cc5a48717bed67bcb9e32b77e51ea9f53c7:/src/instr/instr_paje_types.cpp diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp index 7cad3f6a9f..2d7a70f14e 100644 --- a/src/instr/instr_paje_types.cpp +++ b/src/instr/instr_paje_types.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2020. The SimGrid Team. +/* Copyright (c) 2012-2022. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,39 +9,43 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)"); -// 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(e_event_type event_type, const std::string& name, const std::string& alias, const std::string& color, - Type* father) - : id_(new_paje_id()), name_(name), color_(color), father_(father) +long long int new_paje_id() +{ + static long long int type_id = 0; + return type_id++; +} + +Type::Type(PajeEventType event_type, const std::string& name, const std::string& alias, const std::string& color, + Type* parent) + : name_(name), color_(color), parent_(parent) { if (name_.empty() || alias.empty()) throw TracingError(XBT_THROW_POINT, "can't create a new type with no name or alias"); - if (father != nullptr){ - father->children_[alias].reset(this); - XBT_DEBUG("new type %s, child of %s", get_cname(), father->get_cname()); + if (parent != nullptr) { + parent->children_[alias].reset(this); + XBT_DEBUG("new type %s, child of %s", get_cname(), parent->get_cname()); on_creation(*this, event_type); } } void StateType::set_event(const std::string& value_name) { - events_.push_back(new StateEvent(get_issuer(), this, PAJE_SetState, get_entity_value(value_name), nullptr)); + events_.push_back(new StateEvent(get_issuer(), this, PajeEventType::SetState, get_entity_value(value_name), nullptr)); } void StateType::push_event(const std::string& value_name, TIData* extra) { - events_.push_back(new StateEvent(get_issuer(), this, PAJE_PushState, get_entity_value(value_name), extra)); + events_.push_back(new StateEvent(get_issuer(), this, PajeEventType::PushState, get_entity_value(value_name), extra)); } void StateType::push_event(const std::string& value_name) { - events_.push_back(new StateEvent(get_issuer(), this, PAJE_PushState, get_entity_value(value_name), nullptr)); + events_.push_back( + new StateEvent(get_issuer(), this, PajeEventType::PushState, get_entity_value(value_name), nullptr)); } void StateType::pop_event() @@ -51,7 +55,7 @@ void StateType::pop_event() void StateType::pop_event(TIData* extra) { - events_.push_back(new StateEvent(get_issuer(), this, PAJE_PopState, nullptr, extra)); + events_.push_back(new StateEvent(get_issuer(), this, PajeEventType::PopState, nullptr, extra)); } void VariableType::instr_event(double now, double delta, const char* resource, double value) @@ -61,14 +65,12 @@ void VariableType::instr_event(double now, double delta, const char* resource, d * 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()) { + // to check if variables were previously set to 0, otherwise paje won't simulate them + // create a key considering the resource and variable, and check if key exists in the global map: + // if it doesn't, set the variable to zero. + if (static std::set> platform_variables; + platform_variables.emplace(std::string(resource) + get_name()).second) set_event(now, 0); - platform_variables.insert(key); - } add_event(now, value); sub_event(now + delta, value); @@ -76,48 +78,43 @@ void VariableType::instr_event(double now, double delta, const char* resource, d void VariableType::set_event(double timestamp, double value) { - events_.push_back(new VariableEvent(timestamp, get_issuer(), this, PAJE_SetVariable, value)); + events_.push_back(new VariableEvent(timestamp, get_issuer(), this, PajeEventType::SetVariable, value)); } void VariableType::add_event(double timestamp, double value) { - events_.push_back(new VariableEvent(timestamp, get_issuer(), this, PAJE_AddVariable, value)); + events_.push_back(new VariableEvent(timestamp, get_issuer(), this, PajeEventType::AddVariable, value)); } void VariableType::sub_event(double timestamp, double value) { - events_.push_back(new VariableEvent(timestamp, get_issuer(), this, PAJE_SubVariable, value)); -} - -void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key) -{ - start_event(startContainer, value, key, -1); + events_.push_back(new VariableEvent(timestamp, get_issuer(), this, PajeEventType::SubVariable, value)); } -void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key, int size) +void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key, size_t size) { - new LinkEvent(get_issuer(), this, PAJE_StartLink, startContainer, value, key, size); + new LinkEvent(get_issuer(), this, PajeEventType::StartLink, startContainer, value, key, size); } void LinkType::end_event(Container* endContainer, const std::string& value, const std::string& key) { - new LinkEvent(get_issuer(), this, PAJE_EndLink, endContainer, value, key, -1); + new LinkEvent(get_issuer(), this, PajeEventType::EndLink, endContainer, value, key); } Type* Type::by_name(const std::string& name) { Type* ret = nullptr; - for (auto const& elm : children_) { - if (elm.second->name_ == name) { + for (auto const& [_, child] : children_) { + if (child->name_ == name) { if (ret != nullptr) { throw TracingError(XBT_THROW_POINT, "there are two children types with the same name?"); } else { - ret = elm.second.get(); + ret = child.get(); } } } if (ret == nullptr) - throw TracingError(XBT_THROW_POINT, xbt::string_printf("type with name (%s) not found in father type (%s)", + throw TracingError(XBT_THROW_POINT, xbt::string_printf("type with name (%s) not found in parent type (%s)", name.c_str(), get_cname())); return ret; } @@ -135,7 +132,7 @@ void ValueType::add_entity_value(const std::string& name, const std::string& col auto it = values_.find(name); if (it == values_.end()) { XBT_DEBUG("new value %s, child of %s", name.c_str(), get_cname()); - values_.emplace(name, EntityValue(name, color, this)); + values_.try_emplace(name, name, color, this); } } @@ -143,7 +140,7 @@ EntityValue* ValueType::get_entity_value(const std::string& name) { auto ret = values_.find(name); if (ret == values_.end()) { - throw TracingError(XBT_THROW_POINT, xbt::string_printf("value with name (%s) not found in father type (%s)", + throw TracingError(XBT_THROW_POINT, xbt::string_printf("value with name (%s) not found in parent type (%s)", name.c_str(), get_cname())); } return &ret->second; @@ -157,7 +154,7 @@ VariableType* Type::by_name_or_create(const std::string& name, const std::string : static_cast(cont->second.get()); } -LinkType* Type::by_name_or_create(const std::string& name, Type* source, Type* dest) +LinkType* Type::by_name_or_create(const std::string& name, const Type* source, const Type* dest) { std::string alias = name + "-" + std::to_string(source->id_) + "-" + std::to_string(dest->id_); auto it = children_.find(alias);