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<std::string> platform_variables;
namespace simgrid {
namespace instr {
father->children_.insert({alias, this});
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());
+ }
}
Type::~Type()
events_.clear();
}
+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()) {
+ setEvent(now, 0);
+ platform_variables.insert(key);
+ }
+
+ addEvent(now, value);
+ subEvent(now + delta, value);
+}
+
void VariableType::setEvent(double timestamp, double value)
{
events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SetVariable, value));
LinkType::LinkType(std::string name, std::string alias, Type* father) : ValueType(name, alias, father)
{
}
-void LinkType::startEvent(container_t startContainer, std::string value, std::string key)
+void LinkType::startEvent(Container* startContainer, std::string value, std::string key)
{
startEvent(startContainer, value, key, -1);
}
-void LinkType::startEvent(container_t startContainer, std::string value, std::string key, int size)
+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_t endContainer, std::string value, std::string key)
+void LinkType::endEvent(Container* endContainer, std::string value, std::string key)
{
new LinkEvent(issuer_, this, PAJE_EndLink, endContainer, value, key, -1);
}
{
if (trace_format != simgrid::instr::TraceFormat::Paje)
return;
- std::stringstream stream;
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();
+ stream_ << event_type << " " << get_id() << " " << father_->get_id() << " " << get_name();
if (isColored())
- stream << " \"" << color_ << "\"";
- XBT_DEBUG("Dump %s", stream.str().c_str());
- stream << std::endl;
- fprintf(tracing_file, "%s", stream.str().c_str());
+ 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)
{
if (trace_format != simgrid::instr::TraceFormat::Paje)
return;
- std::stringstream stream;
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());
+ 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_) {
return ret->second;
}
-ContainerType* Type::getOrCreateContainerType(std::string name)
-{
- auto cont = children_.find(name);
- return cont == children_.end() ? new ContainerType(name, this) : static_cast<ContainerType*>(cont->second);
-}
-
-EventType* Type::getOrCreateEventType(std::string name)
-{
- auto cont = children_.find(name);
- return cont == children_.end() ? new EventType(name, this) : static_cast<EventType*>(cont->second);
-}
-
-StateType* Type::getOrCreateStateType(std::string name)
-{
- auto cont = children_.find(name);
- return cont == children_.end() ? new StateType(name, this) : static_cast<StateType*>(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<VariableType*>(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);
