X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d72bc00352d78cb2d037eeff71ef743e13b28c54..c4000f89d4644c3d7ff6187a62a0930c4d53e683:/src/instr/instr_paje_types.cpp diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp index e9bd24f378..141c330aba 100644 --- a/src/instr/instr_paje_types.cpp +++ b/src/instr/instr_paje_types.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2014-2017. The SimGrid Team. +/* Copyright (c) 2012-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,8 +8,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)"); -static simgrid::instr::ContainerType* rootType = nullptr; /* the root type */ -extern FILE* tracing_file; +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 { @@ -22,7 +23,10 @@ Type::Type(std::string name, std::string alias, std::string color, Type* father) if (father != nullptr){ father->children_.insert({alias, this}); - XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->getCname()); + XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->get_cname()); + } + if (trace_format == simgrid::instr::TraceFormat::Paje) { + stream_ << std::fixed << std::setprecision(TRACE_precision()); } } @@ -40,20 +44,20 @@ ValueType::~ValueType() ContainerType::ContainerType(std::string name, Type* father) : Type(name, name, "", father) { - XBT_DEBUG("ContainerType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId()); - logDefinition(PAJE_DefineContainerType); + 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) { - XBT_DEBUG("EventType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId()); - logDefinition(PAJE_DefineEventType); + 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) { - XBT_DEBUG("StateType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId()); - logDefinition(PAJE_DefineStateType); + XBT_DEBUG("StateType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id()); + log_definition(PAJE_DefineStateType); } StateType::~StateType() @@ -61,31 +65,35 @@ StateType::~StateType() events_.clear(); } -void StateType::setEvent(std::string value_name) +void StateType::set_event(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) { - events_.push_back(new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_SetState, getEntityValue(value_name))); + events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, get_entity_value(value_name), extra)); } -void StateType::pushEvent(std::string value_name, void* extra) +void StateType::push_event(std::string value_name) { - events_.push_back( - new StateEvent(SIMIX_get_clock(), 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(SIMIX_get_clock(), issuer_, this, PAJE_PushState, getEntityValue(value_name))); + events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr, nullptr)); } -void StateType::popEvent() +void StateType::pop_event(TIData* extra) { - events_.push_back(new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_PopState, 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) { - XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId()); - logDefinition(PAJE_DefineVariableType); + XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id()); + log_definition(PAJE_DefineVariableType); } VariableType::~VariableType() @@ -93,71 +101,83 @@ VariableType::~VariableType() events_.clear(); } -void VariableType::setEvent(double timestamp, Container* container, double value) +void VariableType::instr_event(double now, double delta, const char* resource, double value) { - events_.push_back(new VariableEvent(timestamp, container, this, PAJE_SetVariable, value)); + /* 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::addEvent(double timestamp, Container* container, double value) +void VariableType::set_event(double timestamp, double value) { - events_.push_back(new VariableEvent(timestamp, container, this, PAJE_AddVariable, value)); + events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SetVariable, value)); } -void VariableType::subEvent(double timestamp, Container* container, double value) +void VariableType::add_event(double timestamp, double value) { - events_.push_back(new VariableEvent(timestamp, container, this, PAJE_SubVariable, value)); + events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_AddVariable, 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) { } -void LinkType::startEvent(double timestamp, Container* container, container_t endpoint, std::string value, - std::string key) +void LinkType::start_event(Container* startContainer, std::string value, std::string key) { - startEvent(timestamp, container, endpoint, value, key, -1); + start_event(startContainer, value, key, -1); } -void LinkType::startEvent(double timestamp, Container* container, container_t endpoint, std::string value, - std::string key, int size) +void LinkType::start_event(Container* startContainer, std::string value, std::string key, int size) { - new LinkEvent(timestamp, container, this, PAJE_StartLink, endpoint, value, key, size); + new LinkEvent(issuer_, this, PAJE_StartLink, startContainer, value, key, size); } -void LinkType::endEvent(double timestamp, Container* container, container_t endpoint, std::string value, - std::string key) +void LinkType::end_event(Container* endContainer, std::string value, std::string key) { - new LinkEvent(timestamp, container, this, PAJE_EndLink, endpoint, value, 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 (instr_fmt_type != instr_fmt_paje) + if (trace_format != simgrid::instr::TraceFormat::Paje) return; - std::stringstream stream; - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, event_type, TRACE_precision(), 0.); - stream << std::fixed << std::setprecision(TRACE_precision()) << event_type << " " << getId(); - stream << " " << father_->getId() << " " << getName(); - if (isColored()) - stream << " \"" << color_ << "\""; - XBT_DEBUG("Dump %s", stream.str().c_str()); - stream << std::endl; - fprintf(tracing_file, "%s", stream.str().c_str()); + 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 (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 (instr_fmt_type != instr_fmt_paje) + if (trace_format != simgrid::instr::TraceFormat::Paje) return; - std::stringstream stream; - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, PAJE_DefineLinkType, TRACE_precision(), 0.); - stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DefineLinkType << " " << getId(); - stream << " " << father_->getId() << " " << source->getId() << " " << dest->getId() << " " << getName(); - XBT_DEBUG("Dump %s", stream.str().c_str()); - stream << std::endl; - fprintf(tracing_file, "%s", stream.str().c_str()); + XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, PAJE_DefineLinkType, TRACE_precision(), 0.); + stream_ << PAJE_DefineLinkType << " " << get_id() << " " << father_->get_id() << " " << source->get_id(); + stream_ << " " << dest->get_id() << " " << get_name(); + XBT_DEBUG("Dump %s", stream_.str().c_str()); + tracing_file << stream_.str() << std::endl; } -Type* Type::byName(std::string name) +Type* Type::by_name(std::string name) { Type* ret = nullptr; for (auto elm : children_) { @@ -170,16 +190,16 @@ Type* Type::byName(std::string name) } } if (ret == nullptr) - THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name.c_str(), getCname()); + THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name.c_str(), get_cname()); return ret; } -void ValueType::addEntityValue(std::string name) +void ValueType::add_entity_value(std::string name) { - addEntityValue(name, ""); + add_entity_value(name, ""); } -void ValueType::addEntityValue(std::string name, std::string color) +void ValueType::add_entity_value(std::string name, std::string color) { if (name.empty()) THROWF(tracing_error, 0, "can't get a value with no name"); @@ -188,65 +208,36 @@ void ValueType::addEntityValue(std::string name, std::string color) if (it == values_.end()) { EntityValue* new_val = new EntityValue(name, color, this); values_.insert({name, new_val}); - XBT_DEBUG("new value %s, child of %s", name.c_str(), getCname()); + XBT_DEBUG("new value %s, child of %s", name.c_str(), get_cname()); new_val->print(); } } -EntityValue* ValueType::getEntityValue(std::string name) +EntityValue* ValueType::get_entity_value(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(), getCname()); + THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), get_cname()); } return ret->second; } -ContainerType* Type::createRootType() -{ - rootType = new ContainerType("0"); - return rootType; -} - -ContainerType* Type::getRootType() -{ - return rootType; -} - -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); -} - -VariableType* Type::getOrCreateVariableType(std::string name, std::string color) +VariableType* Type::by_name_or_create(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(cont->second); } -LinkType* Type::getOrCreateLinkType(std::string name, Type* source, Type* dest) +LinkType* Type::by_name_or_create(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); if (it == children_.end()) { LinkType* ret = new LinkType(name, alias, this); - XBT_DEBUG("LinkType %s(%lld), child of %s(%lld) %s(%lld)->%s(%lld)", ret->getCname(), ret->getId(), getCname(), - getId(), source->getCname(), source->getId(), dest->getCname(), dest->getId()); - ret->logDefinition(source, dest); + 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->log_definition(source, dest); return ret; } else return static_cast(it->second);