X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d0d38195d856b3c1d4161bf29b413abb3cb7ef2..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/instr/instr_paje_types.cpp diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp index aca269a3ff..141c330aba 100644 --- a/src/instr/instr_paje_types.cpp +++ b/src/instr/instr_paje_types.cpp @@ -8,7 +8,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)"); -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 { @@ -43,19 +45,19 @@ ValueType::~ValueType() ContainerType::ContainerType(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) { 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) { 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() @@ -63,27 +65,27 @@ 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, getEntityValue(value_name), nullptr)); + events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, get_entity_value(value_name), nullptr)); } -void StateType::pushEvent(std::string value_name, TIData* extra) +void StateType::push_event(std::string value_name, TIData* extra) { - 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), extra)); } -void StateType::pushEvent(std::string value_name) +void StateType::push_event(std::string value_name) { - events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, getEntityValue(value_name), nullptr)); + events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, get_entity_value(value_name), nullptr)); } -void StateType::popEvent() +void StateType::pop_event() { 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)); } @@ -91,7 +93,7 @@ void StateType::popEvent(TIData* 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)", get_cname(), get_id(), father->get_cname(), father->get_id()); - logDefinition(PAJE_DefineVariableType); + log_definition(PAJE_DefineVariableType); } VariableType::~VariableType() @@ -99,17 +101,37 @@ VariableType::~VariableType() events_.clear(); } -void VariableType::setEvent(double timestamp, double value) +void VariableType::instr_event(double now, double delta, const char* resource, double 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::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)); } @@ -117,34 +139,34 @@ void VariableType::subEvent(double timestamp, double value) LinkType::LinkType(std::string name, 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, std::string value, 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, std::string value, 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, std::string value, 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()); - fprintf(tracing_file, "%s\n", 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; @@ -152,10 +174,10 @@ void Type::logDefinition(simgrid::instr::Type* source, simgrid::instr::Type* des 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()); - fprintf(tracing_file, "%s\n", 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_) { @@ -172,12 +194,12 @@ Type* Type::byName(std::string name) 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"); @@ -191,7 +213,7 @@ void ValueType::addEntityValue(std::string name, std::string color) } } -EntityValue* ValueType::getEntityValue(std::string name) +EntityValue* ValueType::get_entity_value(std::string name) { auto ret = values_.find(name); if (ret == values_.end()) { @@ -200,32 +222,14 @@ EntityValue* ValueType::getEntityValue(std::string name) 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); -} - -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); @@ -233,7 +237,7 @@ 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);