-/* 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
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;
namespace simgrid {
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());
}
}
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());
+ XBT_DEBUG("ContainerType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
logDefinition(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());
+ XBT_DEBUG("EventType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
logDefinition(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());
+ XBT_DEBUG("StateType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
logDefinition(PAJE_DefineStateType);
}
events_.clear();
}
-void StateType::setEvent(double timestamp, Container* container, std::string value_name)
+void StateType::setEvent(std::string value_name)
{
- events_.push_back(new StateEvent(timestamp, container, this, PAJE_SetState, getEntityValue(value_name)));
+ events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, getEntityValue(value_name), nullptr));
}
-void StateType::pushEvent(double timestamp, Container* container, std::string value_name, void* extra)
+void StateType::pushEvent(std::string value_name, TIData* extra)
{
- events_.push_back(new StateEvent(timestamp, container, this, PAJE_PushState, getEntityValue(value_name), extra));
+ events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, getEntityValue(value_name), extra));
}
-void StateType::pushEvent(double timestamp, Container* container, std::string value_name)
+void StateType::pushEvent(std::string value_name)
{
- events_.push_back(new StateEvent(timestamp, container, this, PAJE_PushState, getEntityValue(value_name)));
+ events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, getEntityValue(value_name), nullptr));
}
-void StateType::popEvent(double timestamp, Container* container)
+void StateType::popEvent()
{
- events_.push_back(new StateEvent(timestamp, container, this, PAJE_PopState, nullptr));
+ events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr, nullptr));
+}
+
+void StateType::popEvent(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)
{
- XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", getCname(), getId(), father->getCname(), father->getId());
+ XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
logDefinition(PAJE_DefineVariableType);
}
events_.clear();
}
-void VariableType::setEvent(double timestamp, Container* container, double value)
+void VariableType::setEvent(double timestamp, double value)
{
- events_.push_back(new VariableEvent(timestamp, container, this, PAJE_SetVariable, value));
+ events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SetVariable, value));
}
-void VariableType::addEvent(double timestamp, Container* container, double value)
+void VariableType::addEvent(double timestamp, double value)
{
- events_.push_back(new VariableEvent(timestamp, container, this, PAJE_AddVariable, value));
+ events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_AddVariable, value));
}
-void VariableType::subEvent(double timestamp, Container* container, double value)
+void VariableType::subEvent(double timestamp, double value)
{
- events_.push_back(new VariableEvent(timestamp, container, this, PAJE_SubVariable, 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(Container* startContainer, std::string value, std::string key)
+{
+ startEvent(startContainer, value, key, -1);
+}
+
+void LinkType::startEvent(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)
+{
+ new LinkEvent(issuer_, this, PAJE_EndLink, endContainer, value, key, -1);
+}
void Type::logDefinition(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();
+ XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, event_type, TRACE_precision(), 0.);
+ stream << std::fixed << std::setprecision(TRACE_precision()) << event_type << " " << get_id();
+ stream << " " << father_->get_id() << " " << get_name();
if (isColored())
stream << " \"" << color_ << "\"";
XBT_DEBUG("Dump %s", stream.str().c_str());
void Type::logDefinition(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("%s: event_type=%u, timestamp=%.*f", __func__, PAJE_DefineLinkType, TRACE_precision(), 0.);
+ stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DefineLinkType << " " << get_id();
+ stream << " " << father_->get_id() << " " << source->get_id() << " " << dest->get_id() << " " << get_name();
XBT_DEBUG("Dump %s", stream.str().c_str());
stream << std::endl;
fprintf(tracing_file, "%s", stream.str().c_str());
}
}
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;
}
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();
}
}
{
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 = static_cast<ContainerType*>(new simgrid::instr::Type("0", "0", "", nullptr));
- return rootType;
-}
-
-ContainerType* Type::getRootType()
-{
- return rootType;
-}
-
ContainerType* Type::getOrCreateContainerType(std::string name)
{
auto cont = children_.find(name);
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());
+ 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);
return ret;
} else