X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38f7ddbf61f574a934f191ef2d8358d9f8be1f96..585eeb393ae78877bab30573f224a2171074a6ca:/src/instr/instr_paje_trace.cpp diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index 2676cd1baa..81f33e6940 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -1,15 +1,15 @@ -/* Copyright (c) 2010-2016. The SimGrid Team. +/* Copyright (c) 2010-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/instr/instr_private.h" -#include "src/instr/instr_smpi.h" -#include "src/smpi/private.hpp" +#include "simgrid/sg_config.h" +#include "src/instr/instr_private.hpp" +#include "src/instr/instr_smpi.hpp" +#include "src/smpi/include/private.hpp" #include "typeinfo" #include "xbt/virtu.h" /* sg_cmdline */ -#include "simgrid/sg_config.h" #include #include @@ -24,17 +24,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system") static std::stringstream stream; FILE *tracing_file = nullptr; -static xbt_dict_t tracing_files = nullptr; // TI specific +static std::map tracing_files; // TI specific static double prefix=0.0; // TI specific - -void print_NULL(PajeEvent* event){} - -/* The active set of functions for the selected trace format - * By default, they all do nothing, hence the print_NULL to avoid segfaults */ - -std::vector buffer; -void buffer_debug(std::vector *buf); +std::vector buffer; +void buffer_debug(std::vector* buf); void dump_comment (const char *comment) { @@ -74,15 +68,15 @@ void TRACE_paje_dump_buffer (int force) return; XBT_DEBUG("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump); if (force){ - for (auto event : buffer){ + for (auto const& event : buffer) { event->print(); delete event; } buffer.clear(); }else{ - std::vector::iterator i = buffer.begin(); - for (auto event :buffer){ - double head_timestamp = event->timestamp; + std::vector::iterator i = buffer.begin(); + for (auto const& event : buffer) { + double head_timestamp = event->timestamp_; if (head_timestamp > TRACE_last_timestamp_to_dump) break; event->print(); @@ -94,11 +88,12 @@ void TRACE_paje_dump_buffer (int force) XBT_DEBUG("%s: ends", __FUNCTION__); } -void buffer_debug(std::vector *buf); -void buffer_debug(std::vector *buf) { +void buffer_debug(std::vector* buf); +void buffer_debug(std::vector* buf) +{ return; XBT_DEBUG(">>>>>> Dump the state of the buffer. %zu events", buf->size()); - for (auto event :*buf){ + for (auto const& event : *buf) { event->print(); XBT_DEBUG("%p %s", event, stream.str().c_str()); stream.str(""); @@ -115,33 +110,33 @@ static void print_row() { stream.clear(); } -static void print_timestamp(PajeEvent* event) { +static void print_timestamp(simgrid::instr::PajeEvent* event) +{ stream << " "; /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */ - if (event->timestamp < 1e-12) + if (event->timestamp_ < 1e-12) stream << 0; else - stream << event->timestamp; + stream << event->timestamp_; } /* internal do the instrumentation module */ -static void insert_into_buffer (PajeEvent* tbi) +void simgrid::instr::PajeEvent::insertIntoBuffer() { - if (TRACE_buffer() == 0){ - tbi->print (); - delete tbi; + if (not TRACE_buffer()) { + print(); + delete this; return; } buffer_debug(&buffer); - XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%zu)", - __FUNCTION__, (int)tbi->event_type, tbi->timestamp, buffer.size()); - std::vector::reverse_iterator i; + XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%zu)", __FUNCTION__, static_cast(eventType_), + timestamp_, buffer.size()); + std::vector::reverse_iterator i; for (i = buffer.rbegin(); i != buffer.rend(); ++i) { - PajeEvent* e1 = *i; - XBT_DEBUG("compare to %p is of type %d; timestamp:%f", e1, - (int)e1->event_type, e1->timestamp); - if (e1->timestamp <= tbi->timestamp) + simgrid::instr::PajeEvent* e1 = *i; + XBT_DEBUG("compare to %p is of type %d; timestamp:%f", e1, static_cast(e1->eventType_), e1->timestamp_); + if (e1->timestamp_ <= timestamp_) break; } if (i == buffer.rend()) @@ -149,31 +144,15 @@ static void insert_into_buffer (PajeEvent* tbi) else if (i == buffer.rbegin()) XBT_DEBUG("%s: inserted at end", __FUNCTION__); else - XBT_DEBUG("%s: inserted at pos= %zd from its end", __FUNCTION__, - std::distance(buffer.rbegin(),i)); - buffer.insert(i.base(), tbi); + XBT_DEBUG("%s: inserted at pos= %zd from its end", __FUNCTION__, std::distance(buffer.rbegin(), i)); + buffer.insert(i.base(), this); buffer_debug(&buffer); } -PajeEvent:: ~PajeEvent() +simgrid::instr::PajeEvent::~PajeEvent() { - XBT_DEBUG("%s not implemented for %p: event_type=%d, timestamp=%f", __FUNCTION__, - this, (int)event_type, timestamp); -// xbt_backtrace_display_current(); - - /* switch (event->event_type){ - case PAJE_StartLink: - xbt_free (((startLink_t)(event->data))->value); - xbt_free (((startLink_t)(event->data))->key); - break; - case PAJE_EndLink: - xbt_free (((endLink_t)(event->data))->value); - xbt_free (((endLink_t)(event->data))->key); - break; - default: - break; - }*/ + XBT_DEBUG("%s not implemented for %p: event_type=%d, timestamp=%f", __FUNCTION__, this, (int)eventType_, timestamp_); } void TRACE_paje_start() { @@ -212,41 +191,37 @@ void TRACE_paje_end() { XBT_DEBUG("Filename %s is closed", filename); } -void DefineContainerEvent(type_t type) +void LogContainerTypeDefinition(simgrid::instr::Type* type) { - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineContainerType); + XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineContainerType); //print it if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineContainerType, TRACE_precision(), 0.); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << PAJE_DefineContainerType; - stream << " " << type->id - << " " << type->father->id - << " " << type->name; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } - //-- + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineContainerType, + TRACE_precision(), 0.); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << simgrid::instr::PAJE_DefineContainerType; + stream << " " << type->getId() << " " << type->father_->getId() << " " << type->getName(); + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } } - - -void LogVariableTypeDefinition(type_t type) +void LogVariableTypeDefinition(simgrid::instr::Type* type) { - - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineVariableType); + XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineVariableType); //print it -if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineVariableType, TRACE_precision(), 0.); + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineVariableType, + TRACE_precision(), 0.); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << PAJE_DefineVariableType; - stream << " " << type->id << " " << type->father->id << " " << type->name; - if (type->color) - stream << " \"" << type->color << "\""; + stream << simgrid::instr::PAJE_DefineVariableType; + stream << " " << type->getId() << " " << type->father_->getId() << " " << type->getName(); + if (type->isColored()) + stream << " \"" << type->color_ << "\""; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -255,16 +230,16 @@ if (instr_fmt_type == instr_fmt_paje) { } } - -void LogStateTypeDefinition(type_t type) +void LogStateTypeDefinition(simgrid::instr::Type* type) { //print it if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineStateType, TRACE_precision(), 0.); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << PAJE_DefineStateType; - stream << " " << type->id << " " << type->father->id << " " << type->name; - print_row(); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineStateType, TRACE_precision(), + 0.); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << simgrid::instr::PAJE_DefineStateType; + stream << " " << type->getId() << " " << type->father_->getId() << " " << type->getName(); + print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ } else { @@ -272,26 +247,15 @@ if (instr_fmt_type == instr_fmt_paje) { } } - -DefineEventTypeEvent::DefineEventTypeEvent(type_t type) +void LogDefineEventType(simgrid::instr::Type* type) { - this->event_type = PAJE_DefineEventType; - this->timestamp = 0; - this->type = type; - - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event_type); - //print it - print(); -} - - -void DefineEventTypeEvent::print() { if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineEventType, + TRACE_precision(), 0.); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - stream << " " << type->id << " " << type->father->id << " " << type->name; + stream << simgrid::instr::PAJE_DefineEventType; + stream << " " << type->getId() << " " << type->father_->getId() << " " << type->getName(); print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -300,16 +264,18 @@ void DefineEventTypeEvent::print() { } } -void LogLinkTypeDefinition(type_t type, type_t source, type_t dest) +void LogLinkTypeDefinition(simgrid::instr::Type* type, simgrid::instr::Type* source, simgrid::instr::Type* dest) { - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineLinkType); + XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineLinkType); //print it if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, PAJE_DefineLinkType, TRACE_precision(), 0.); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << PAJE_DefineLinkType; - stream << " " << type->id << " " << type->father->id << " " << source->id << " " << dest->id << " " << type->name; - print_row(); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineLinkType, TRACE_precision(), + 0.); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << simgrid::instr::PAJE_DefineLinkType; + stream << " " << type->getId() << " " << type->father_->getId() << " " << source->getId() << " " << dest->getId() + << " " << type->getName(); + print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ } else { @@ -317,16 +283,16 @@ if (instr_fmt_type == instr_fmt_paje) { } } -void LogEntityValue (val_t value) +void simgrid::instr::Value::print() { - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineEntityValue); + XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineEntityValue); //print it -if (instr_fmt_type == instr_fmt_paje) { + if (instr_fmt_type == instr_fmt_paje) { stream << std::fixed << std::setprecision(TRACE_precision()); - stream << PAJE_DefineEntityValue; - stream << " " << value->id << " " << value->father->id << " " << value->name; - if (value->color) - stream << " \"" << value->color << "\""; + stream << simgrid::instr::PAJE_DefineEntityValue; + stream << " " << id_ << " " << father_->getId() << " " << name_; + if (isColored()) + stream << " \"" << color_ << "\""; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -335,39 +301,37 @@ if (instr_fmt_type == instr_fmt_paje) { } } - void LogContainerCreation (container_t container) { - double timestamp = SIMIX_get_clock(); + double timestamp = SIMIX_get_clock(); - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, PAJE_CreateContainer,timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, simgrid::instr::PAJE_CreateContainer, timestamp); -if (instr_fmt_type == instr_fmt_paje) { + if (instr_fmt_type == instr_fmt_paje) { stream << std::fixed << std::setprecision(TRACE_precision()); - stream << PAJE_CreateContainer; + stream << simgrid::instr::PAJE_CreateContainer; stream << " "; /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */ - if (timestamp < 1e-12) - stream << 0; - else - stream << timestamp; - stream << " " << container->id << " " << container->type->id << " " << container->father->id << " \"" - << container->name << "\""; + if (timestamp < 1e-12) + stream << 0; + else + stream << timestamp; + stream << " " << container->id_ << " " << container->type_->getId() << " " << container->father_->id_ << " \"" + << container->name_ << "\""; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { // if we are in the mode with only one file static FILE* ti_unique_file = nullptr; - if (tracing_files == nullptr) { - tracing_files = xbt_dict_new_homogeneous(nullptr); + if (tracing_files.empty()) { // generate unique run id with time prefix = xbt_os_time(); } if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || ti_unique_file == nullptr) { char* folder_name = bprintf("%s_files", TRACE_get_filename()); - char* filename = bprintf("%s/%f_%s.txt", folder_name, prefix, container->name); + char* filename = bprintf("%s/%f_%s.txt", folder_name, prefix, container->name_.c_str()); #ifdef WIN32 _mkdir(folder_name); #else @@ -381,7 +345,7 @@ if (instr_fmt_type == instr_fmt_paje) { xbt_free(filename); } - xbt_dict_set(tracing_files, container->name, (void*)ti_unique_file, nullptr); + tracing_files.insert({container, ti_unique_file}); } else { THROW_IMPOSSIBLE; } @@ -391,51 +355,45 @@ void LogContainerDestruction(container_t container) { double timestamp = SIMIX_get_clock(); - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, PAJE_DestroyContainer, timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, simgrid::instr::PAJE_DestroyContainer, timestamp); -if (instr_fmt_type == instr_fmt_paje) { + if (instr_fmt_type == instr_fmt_paje) { stream << std::fixed << std::setprecision(TRACE_precision()); - stream << PAJE_DestroyContainer; + stream << simgrid::instr::PAJE_DestroyContainer; stream << " "; /* prevent 0.0000 in the trace - this was the behavior before the transition to c++ */ if (timestamp < 1e-12) stream << 0; - else - stream << timestamp; - stream << " " << container->type->id << " " << container->id; + else + stream << timestamp; + stream << " " << container->type_->getId() << " " << container->id_; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { - if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || xbt_dict_length(tracing_files) == 1) { - FILE* f = (FILE*)xbt_dict_get_or_null(tracing_files, container->name); + if (not xbt_cfg_get_boolean("tracing/smpi/format/ti-one-file") || tracing_files.size() == 1) { + FILE* f = tracing_files.at(container); fclose(f); } - xbt_dict_remove(tracing_files, container->name); - } else { - THROW_IMPOSSIBLE; - } + tracing_files.erase(container); + } else { + THROW_IMPOSSIBLE; + } } - -SetVariableEvent::SetVariableEvent (double timestamp, container_t container, type_t type, double value) +simgrid::instr::SetVariableEvent::SetVariableEvent(double timestamp, container_t container, Type* type, double value) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_SetVariable), value(value) { - this->event_type = PAJE_SetVariable; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->value = value; - - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - insert_into_buffer (this); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); } -void SetVariableEvent::print() { +void simgrid::instr::SetVariableEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id << " " << value; + stream << " " << type->getId() << " " << container->id_ << " " << value; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -444,26 +402,22 @@ void SetVariableEvent::print() { } } -AddVariableEvent::AddVariableEvent (double timestamp, container_t container, type_t type, double value) +simgrid::instr::AddVariableEvent::AddVariableEvent(double timestamp, container_t container, simgrid::instr::Type* type, + double value) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_AddVariable), value(value) { - this->event_type = PAJE_AddVariable; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->value = value; - - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - insert_into_buffer (this); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); } -void AddVariableEvent::print() { +void simgrid::instr::AddVariableEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id << " " << value; + stream << " " << type->getId() << " " << container->id_ << " " << value; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -472,26 +426,21 @@ void AddVariableEvent::print() { } } -SubVariableEvent::SubVariableEvent (double timestamp, container_t container, type_t type, double value) +simgrid::instr::SubVariableEvent::SubVariableEvent(double timestamp, container_t container, Type* type, double value) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_SubVariable), value(value) { - this->event_type = PAJE_SubVariable; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->value = value; - - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - insert_into_buffer (this); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); } -void SubVariableEvent::print() { +void simgrid::instr::SubVariableEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id << " " << value; + stream << " " << type->getId() << " " << container->id_ << " " << value; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -500,14 +449,9 @@ void SubVariableEvent::print() { } } -SetStateEvent::SetStateEvent (double timestamp, container_t container, type_t type, val_t value) +simgrid::instr::SetStateEvent::SetStateEvent(double timestamp, container_t container, Type* type, Value* value) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_SetState), value(value) { - this->event_type = PAJE_SetState; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->value = value; - #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); @@ -516,19 +460,19 @@ SetStateEvent::SetStateEvent (double timestamp, container_t container, type_t ty } #endif - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - insert_into_buffer (this); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); } -void SetStateEvent::print() { +void simgrid::instr::SetStateEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id; - stream << " " << value->id; + stream << " " << type->getId() << " " << container->id_; + stream << " " << value->getId(); #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { stream << " \"" << filename << "\" " << linenumber; @@ -542,15 +486,10 @@ void SetStateEvent::print() { } } -PushStateEvent::PushStateEvent (double timestamp, container_t container, type_t type, val_t value, void* extra) +simgrid::instr::PushStateEvent::PushStateEvent(double timestamp, container_t container, Type* type, Value* value, + void* extra) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_PushState), value(value), extra_(extra) { - this->event_type = PAJE_PushState; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->value = value; - this->extra_ = extra; - #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { smpi_trace_call_location_t* loc = smpi_trace_get_call_location(); @@ -559,22 +498,23 @@ PushStateEvent::PushStateEvent (double timestamp, container_t container, type_t } #endif - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); - insert_into_buffer (this); + insertIntoBuffer(); } -PushStateEvent::PushStateEvent (double timestamp, container_t container, type_t type, val_t value) - : PushStateEvent(timestamp, container, type, value, nullptr) +simgrid::instr::PushStateEvent::PushStateEvent(double timestamp, container_t container, Type* type, Value* val) + : PushStateEvent(timestamp, container, type, val, nullptr) {} -void PushStateEvent::print() { +void simgrid::instr::PushStateEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id; - stream << " " << value->id; + stream << " " << type->getId() << " " << container->id_; + stream << " " << value->getId(); if (TRACE_display_sizes()) { stream << " "; @@ -605,12 +545,12 @@ void PushStateEvent::print() { char* process_id = nullptr; // FIXME: dirty extract "rank-" from the name, as we want the bare process id here - if (strstr(container->name, "rank-") == nullptr) - process_id = xbt_strdup(container->name); + if (strstr(container->name_.c_str(), "rank-") == nullptr) + process_id = xbt_strdup(container->name_.c_str()); else - process_id = xbt_strdup(container->name + 5); + process_id = xbt_strdup(container->name_.c_str() + 5); - FILE* trace_file = (FILE*)xbt_dict_get(tracing_files, container->name); + FILE* trace_file = tracing_files.at(container); switch (extra->type) { case TRACING_INIT: @@ -700,11 +640,14 @@ void PushStateEvent::print() { fprintf(trace_file, "%d ", extra->recvcounts[i]); fprintf(trace_file, "%d %s %s\n", extra->root, extra->datatype1, extra->datatype2); break; + case TRACING_ALLGATHER: // rank allgather sendcount recvcounts (sendtype) (recvtype) + fprintf(trace_file, "%s allGather %d %d %s %s", process_id, extra->send_size, extra->recv_size, + extra->datatype1, extra->datatype2); + break; case TRACING_WAITANY: case TRACING_SENDRECV: case TRACING_SCATTER: case TRACING_SCATTERV: - case TRACING_ALLGATHER: case TRACING_SCAN: case TRACING_EXSCAN: case TRACING_COMM_SIZE: @@ -713,7 +656,7 @@ void PushStateEvent::print() { case TRACING_SSEND: case TRACING_ISSEND: default: - XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", value->name); + XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", value->getCname()); break; } @@ -729,26 +672,21 @@ void PushStateEvent::print() { } } - -PopStateEvent::PopStateEvent (double timestamp, container_t container, type_t type) +simgrid::instr::PopStateEvent::PopStateEvent(double timestamp, container_t container, Type* type) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_PopState) { - this->event_type = PAJE_PopState; - this->timestamp = timestamp; - this->type = type; - this->container = container; - - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - insert_into_buffer (this); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); } -void PopStateEvent::print() { +void simgrid::instr::PopStateEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id; + stream << " " << type->getId() << " " << container->id_; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -757,26 +695,22 @@ void PopStateEvent::print() { } } -ResetStateEvent::ResetStateEvent (double timestamp, container_t container, type_t type) +simgrid::instr::ResetStateEvent::ResetStateEvent(double timestamp, container_t container, Type* type) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_ResetState) { - this->event_type = PAJE_ResetState; - this->timestamp = timestamp; - this->type = type; - this->container = container; - - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - insert_into_buffer (this); - delete [] this; + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); + delete[] this; } -void ResetStateEvent::print() { +void simgrid::instr::ResetStateEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id; + stream << " " << type->getId() << " " << container->id_; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -785,45 +719,36 @@ void ResetStateEvent::print() { } } -StartLinkEvent::~StartLinkEvent() -{ - free(value); - free(key); -} -StartLinkEvent::StartLinkEvent (double timestamp, container_t container, - type_t type, container_t sourceContainer, const char *value, const char *key) - : StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1) +simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type, + container_t sourceContainer, std::string value, std::string key) + : StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1) {} -StartLinkEvent::StartLinkEvent (double timestamp, container_t container, type_t type, container_t sourceContainer, - const char *value, const char *key, int size) +simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type, + container_t sourceContainer, std::string value, std::string key, + int size) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_StartLink) + , sourceContainer_(sourceContainer) + , value_(value) + , key_(key) + , size_(size) { - event_type = PAJE_StartLink; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->sourceContainer = sourceContainer; - this->value = xbt_strdup(value); - this->key = xbt_strdup(key); - this->size = size; - - XBT_DEBUG("%s: event_type=%d, timestamp=%f, value:%s", __FUNCTION__, - (int)event_type, this->timestamp, this->value); - - insert_into_buffer (this); + XBT_DEBUG("%s: event_type=%d, timestamp=%f, value:%s", __FUNCTION__, (int)eventType_, this->timestamp_, this->value_.c_str()); + insertIntoBuffer(); } -void StartLinkEvent::print() { +void simgrid::instr::StartLinkEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id << " " << value; - stream << " " << sourceContainer->id << " " << key; + stream << " " << type->getId() << " " << container->id_ << " " << value_; + stream << " " << sourceContainer_->id_ << " " << key_; if (TRACE_display_sizes()) { - stream << " " << size; + stream << " " << size_; } print_row(); } else if (instr_fmt_type == instr_fmt_TI) { @@ -833,35 +758,26 @@ void StartLinkEvent::print() { } } -EndLinkEvent::EndLinkEvent (double timestamp, container_t container, type_t type, container_t destContainer, - const char *value, const char *key) +simgrid::instr::EndLinkEvent::EndLinkEvent(double timestamp, container_t container, Type* type, + container_t destContainer, std::string value, std::string key) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_EndLink) + , destContainer(destContainer) + , value(value) + , key(key) { - this->event_type = PAJE_EndLink; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->destContainer = destContainer; - this->value = xbt_strdup(value); - this->key = xbt_strdup(key); - - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - insert_into_buffer (this); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); } -EndLinkEvent::~EndLinkEvent() +void simgrid::instr::EndLinkEvent::print() { - free(value); - free(key); -} -void EndLinkEvent::print() { if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id << " " << value; - stream << " " << destContainer->id << " " << key; + stream << " " << type->getId() << " " << container->id_ << " " << value; + stream << " " << destContainer->id_ << " " << key; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -870,26 +786,24 @@ void EndLinkEvent::print() { } } -NewEvent::NewEvent (double timestamp, container_t container, type_t type, val_t value) +simgrid::instr::NewEvent::NewEvent(double timestamp, container_t container, Type* type, Value* val) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_NewEvent) { - this->event_type = PAJE_NewEvent; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->value = value; + this->val = val; - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); - insert_into_buffer (this); + insertIntoBuffer(); } -void NewEvent::print () { +void simgrid::instr::NewEvent::print() +{ if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; + stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id << " " << container->id << " " << value->id; + stream << " " << type->getId() << " " << container->id_ << " " << val->getId(); print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -898,7 +812,6 @@ void NewEvent::print () { } } - void TRACE_TI_start() { char *filename = TRACE_get_filename(); @@ -917,9 +830,7 @@ void TRACE_TI_start() void TRACE_TI_end() { - xbt_dict_free(&tracing_files); fclose(tracing_file); char *filename = TRACE_get_filename(); XBT_DEBUG("Filename %s is closed", filename); } -