X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9436b840852218b39dce22d6057b6f223168daa..0ff40b115c4a7f131b2ffab880faf600e96cfc06:/src/instr/instr_paje_trace.cpp diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index c574f803f0..bcc695e9ce 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -1,46 +1,25 @@ -/* 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 -#include /** std::setprecision **/ -#include -#ifdef WIN32 -#include // _mkdir -#endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system"); -extern s_instr_trace_writer_t active_writer; - static std::stringstream stream; FILE *tracing_file = nullptr; -static xbt_dict_t tracing_files = nullptr; // 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 */ - -s_instr_trace_writer_t active_writer = {&print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, - &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, - &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL}; +std::map tracing_files; // TI specific -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,21 +53,21 @@ void dump_comment_file (const char *filename) double TRACE_last_timestamp_to_dump = 0; //dumps the trace file until the timestamp TRACE_last_timestamp_to_dump -void TRACE_paje_dump_buffer (int force) +void TRACE_paje_dump_buffer(bool force) { if (not TRACE_is_enabled()) 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(); @@ -100,11 +79,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(""); @@ -121,65 +101,49 @@ 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; -} + else + 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; } - buffer.insert(i.base(), tbi); if (i == buffer.rend()) XBT_DEBUG("%s: inserted at beginning", __FUNCTION__); 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)); + 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() { @@ -218,372 +182,189 @@ void TRACE_paje_end() { XBT_DEBUG("Filename %s is closed", filename); } -DefineContainerEvent::DefineContainerEvent(type_t type) +void simgrid::instr::Type::logContainerTypeDefinition() { - - event_type = PAJE_DefineContainerType; - timestamp = 0; - this->type = type; - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event_type); + XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineContainerType); //print it - print (); -} - -void DefineContainerEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - stream << " " << type->id - << " " << type->father->id - << " " << type->name; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } - + if (instr_fmt_type == instr_fmt_paje) { + 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 << " " << id_ << " " << father_->getId() << " " << name_; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } } - - -DefineVariableTypeEvent::DefineVariableTypeEvent(type_t type) +void simgrid::instr::Type::logVariableTypeDefinition() { - this->event_type = PAJE_DefineVariableType; - this->timestamp = 0; - this->type = type; - - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event_type); + XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineVariableType); //print it - print (); -} - -void DefineVariableTypeEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - stream << " " << type->id - << " " << type->father->id - << " " << type->name; - if (type->color) - stream << " \"" << type->color << "\""; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } + 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 << simgrid::instr::PAJE_DefineVariableType; + stream << " " << id_ << " " << father_->getId() << " " << name_; + if (isColored()) + stream << " \"" << color_ << "\""; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } } -DefineStateTypeEvent::DefineStateTypeEvent(type_t type) +void simgrid::instr::Type::logStateTypeDefinition() { - this->event_type = PAJE_DefineStateType; - this->timestamp = 0; - this->type = type; - - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event_type); - //print it - print(); + if (instr_fmt_type == instr_fmt_paje) { + 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 << " " << id_ << " " << father_->getId() << " " << name_; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } } - -DefineEventTypeEvent::DefineEventTypeEvent(type_t type) +void simgrid::instr::Type::logDefineEventType() { - 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 DefineStateTypeEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - stream << " " << type->id - << " " << type->father->id - << " " << type->name; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -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); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - stream << " " << type->id - << " " << type->father->id - << " " << type->name; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -DefineLinkTypeEvent::DefineLinkTypeEvent(type_t type, type_t source, type_t dest) -{ - this->event_type = PAJE_DefineLinkType; - this->timestamp = 0; - this->type = type; - this->source = source; - this->dest = dest; - - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event_type); - //print it - print(); + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, simgrid::instr::PAJE_DefineEventType, + TRACE_precision(), 0.); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << simgrid::instr::PAJE_DefineEventType; + stream << " " << id_ << " " << father_->getId() << " " << name_; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } } -void DefineLinkTypeEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - stream << " " << type->id - << " " << type->father->id - << " " << source->id - << " " << dest->id - << " " << type->name; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } +void simgrid::instr::Type::logLinkTypeDefinition(simgrid::instr::Type* source, simgrid::instr::Type* dest) +{ + 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__, simgrid::instr::PAJE_DefineLinkType, TRACE_precision(), + 0.); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << simgrid::instr::PAJE_DefineLinkType; + stream << " " << id_ << " " << father_->getId() << " " << source->getId() << " " << dest->getId() << " " << name_; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } } -DefineEntityValueEvent::DefineEntityValueEvent (val_t value) +void simgrid::instr::Value::print() { - this->event_type = PAJE_DefineEntityValue; - this->timestamp = 0; - this->value = value; - - XBT_DEBUG("%s: event_type=%d", __FUNCTION__, (int)event_type); - + XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineEntityValue); //print it - print(); -} - - -void DefineEntityValueEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - stream << " " << value->id - << " " << value->father->id - << " " << value->name; - if(value->color) - stream << " \"" << value->color << "\""; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -CreateContainerEvent::CreateContainerEvent (container_t container) -{ - this->event_type = PAJE_CreateContainer; - this->timestamp = SIMIX_get_clock(); - this->container = container; - - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - print(); -} - -void CreateContainerEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << container->id - << " " << container->type->id - << " " << 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); - //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); -#ifdef WIN32 - _mkdir(folder_name); -#else - mkdir(folder_name, S_IRWXU | S_IRWXG | S_IRWXO); -#endif - ti_unique_file = fopen(filename, "w"); - xbt_assert(ti_unique_file, "Tracefile %s could not be opened for writing: %s", filename, strerror(errno)); - fprintf(tracing_file, "%s\n", filename); - - xbt_free(folder_name); - xbt_free(filename); - } + if (instr_fmt_type == instr_fmt_paje) { + stream << std::fixed << std::setprecision(TRACE_precision()); + 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 */ + } else { + THROW_IMPOSSIBLE; + } +} - xbt_dict_set(tracing_files, container->name, (void *) ti_unique_file, nullptr); - } else { - THROW_IMPOSSIBLE; - } -} -DestroyContainerEvent::DestroyContainerEvent (container_t container) +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_DestroyContainer; - this->timestamp = SIMIX_get_clock(); - this->container = container; + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); +} - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); +void simgrid::instr::SetVariableEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_ << " " << value; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } +} - print(); +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) +{ + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); } -void DestroyContainerEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << container->type->id - << " " << 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); - fclose(f); - } - xbt_dict_remove(tracing_files, container->name); - } else { - THROW_IMPOSSIBLE; - } -} - -SetVariableEvent::SetVariableEvent (double timestamp, container_t container, type_t type, double 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); -} - -void SetVariableEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << type->id - << " " << container->id - << " " << value; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -AddVariableEvent::AddVariableEvent (double timestamp, container_t container, type_t type, double 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); -} - -void AddVariableEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << type->id - << " " << container->id - << " " << value; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} +void simgrid::instr::AddVariableEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_ << " " << value; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } +} -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)eventType_, this->timestamp_); + insertIntoBuffer(); +} - XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp); - - insert_into_buffer (this); -} - -void SubVariableEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << type->id - << " " << container->id - << " " << value; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -SetStateEvent::SetStateEvent (double timestamp, container_t container, type_t type, val_t value) -{ - this->event_type = PAJE_SetState; - this->timestamp = timestamp; - this->type = type; - this->container = container; - this->value = value; +void simgrid::instr::SubVariableEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_ << " " << value; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } +} +simgrid::instr::SetStateEvent::SetStateEvent(double timestamp, container_t container, Type* type, Value* value) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_SetState), 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(); @@ -592,43 +373,36 @@ 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() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << type->id - << " " << container->id; - stream << " " <id; +void simgrid::instr::SetStateEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_; + stream << " " << value->getId(); #if HAVE_SMPI - if (xbt_cfg_get_boolean("smpi/trace-call-location")) { - stream << " \"" << filename - << "\" " << linenumber; - } + if (xbt_cfg_get_boolean("smpi/trace-call-location")) { + stream << " \"" << filename << "\" " << linenumber; + } #endif - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } } -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(); @@ -637,348 +411,319 @@ 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() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << type->id - << " " << container->id; - stream << " " <id; - - if (TRACE_display_sizes()) { - stream << " "; - if (extra_ != nullptr) { - stream << static_cast(extra_)->send_size; - } - else { - stream << 0; - } - } +void simgrid::instr::PushStateEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_; + stream << " " << value->getId(); + + if (TRACE_display_sizes()) { + stream << " "; + if (extra_ != nullptr) { + stream << static_cast(extra_)->send_size; + } else { + stream << 0; + } + } #if HAVE_SMPI - if (xbt_cfg_get_boolean("smpi/trace-call-location")) { - stream << " \"" << filename - << "\" " << linenumber; - } + if (xbt_cfg_get_boolean("smpi/trace-call-location")) { + stream << " \"" << filename << "\" " << linenumber; + } #endif - print_row(); - - if (extra_ != nullptr) { - if (static_cast(extra_)->sendcounts != nullptr) - xbt_free(static_cast(extra_)->sendcounts); - if (static_cast(extra_)->recvcounts != nullptr) - xbt_free(static_cast(extra_)->recvcounts); - xbt_free(extra_); - } - } else if (instr_fmt_type == instr_fmt_TI) { - if (extra_ == nullptr) - return; - instr_extra_data extra = (instr_extra_data)extra_; - - 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); - else - process_id = xbt_strdup(container->name + 5); - - FILE* trace_file = (FILE* )xbt_dict_get(tracing_files, container->name); - - switch (extra->type) { - case TRACING_INIT: - fprintf(trace_file, "%s init\n", process_id); - break; - case TRACING_FINALIZE: - fprintf(trace_file, "%s finalize\n", process_id); - break; - case TRACING_SEND: - fprintf(trace_file, "%s send %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1); - break; - case TRACING_ISEND: - fprintf(trace_file, "%s Isend %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1); - break; - case TRACING_RECV: - fprintf(trace_file, "%s recv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1); - break; - case TRACING_IRECV: - fprintf(trace_file, "%s Irecv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1); - break; - case TRACING_TEST: - fprintf(trace_file, "%s test\n", process_id); - break; - case TRACING_WAIT: - fprintf(trace_file, "%s wait\n", process_id); - break; - case TRACING_WAITALL: - fprintf(trace_file, "%s waitAll\n", process_id); - break; - case TRACING_BARRIER: - fprintf(trace_file, "%s barrier\n", process_id); - break; - case TRACING_BCAST: // rank bcast size (root) (datatype) - fprintf(trace_file, "%s bcast %d ", process_id, extra->send_size); - if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, ""))) - fprintf(trace_file, "%d %s", extra->root, extra->datatype1); - fprintf(trace_file, "\n"); - break; - case TRACING_REDUCE: // rank reduce comm_size comp_size (root) (datatype) - fprintf(trace_file, "%s reduce %d %f ", process_id, extra->send_size, extra->comp_size); - if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, ""))) - fprintf(trace_file, "%d %s", extra->root, extra->datatype1); - fprintf(trace_file, "\n"); - break; - case TRACING_ALLREDUCE: // rank allreduce comm_size comp_size (datatype) - fprintf(trace_file, "%s allReduce %d %f %s\n", process_id, extra->send_size, extra->comp_size, extra->datatype1); - break; - case TRACING_ALLTOALL: // rank alltoall send_size recv_size (sendtype) (recvtype) - fprintf(trace_file, "%s allToAll %d %d %s %s\n", process_id, extra->send_size, extra->recv_size, extra->datatype1, - extra->datatype2); - break; - case TRACING_ALLTOALLV: // rank alltoallv send_size [sendcounts] recv_size [recvcounts] (sendtype) (recvtype) - fprintf(trace_file, "%s allToAllV %d ", process_id, extra->send_size); - for (int i = 0; i < extra->num_processes; i++) - fprintf(trace_file, "%d ", extra->sendcounts[i]); - fprintf(trace_file, "%d ", extra->recv_size); - for (int i = 0; i < extra->num_processes; i++) - fprintf(trace_file, "%d ", extra->recvcounts[i]); - fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2); - break; - case TRACING_GATHER: // rank gather send_size recv_size root (sendtype) (recvtype) - fprintf(trace_file, "%s gather %d %d %d %s %s\n", process_id, extra->send_size, extra->recv_size, extra->root, - extra->datatype1, extra->datatype2); - break; - case TRACING_ALLGATHERV: // rank allgatherv send_size [recvcounts] (sendtype) (recvtype) - fprintf(trace_file, "%s allGatherV %d ", process_id, extra->send_size); - for (int i = 0; i < extra->num_processes; i++) - fprintf(trace_file, "%d ", extra->recvcounts[i]); - fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2); - break; - case TRACING_REDUCE_SCATTER: // rank reducescatter [recvcounts] comp_size (sendtype) - fprintf(trace_file, "%s reduceScatter ", process_id); - for (int i = 0; i < extra->num_processes; i++) - fprintf(trace_file, "%d ", extra->recvcounts[i]); - fprintf(trace_file, "%f %s\n", extra->comp_size, extra->datatype1); - break; - case TRACING_COMPUTING: - fprintf(trace_file, "%s compute %f\n", process_id, extra->comp_size); - break; - case TRACING_SLEEPING: - fprintf(trace_file, "%s sleep %f\n", process_id, extra->sleep_duration); - break; - case TRACING_GATHERV: // rank gatherv send_size [recvcounts] root (sendtype) (recvtype) - fprintf(trace_file, "%s gatherV %d ", process_id, extra->send_size); - for (int i = 0; i < extra->num_processes; i++) - fprintf(trace_file, "%d ", extra->recvcounts[i]); - fprintf(trace_file, "%d %s %s\n", extra->root, 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: - case TRACING_COMM_SPLIT: - case TRACING_COMM_DUP: - case TRACING_SSEND: - case TRACING_ISSEND: - default: - XBT_WARN ("Call from %s impossible to translate into replay command : Not implemented (yet)", - value->name); - break; - } - - if (extra->recvcounts != nullptr) - xbt_free(extra->recvcounts); - if (extra->sendcounts != nullptr) - xbt_free(extra->sendcounts); - xbt_free(process_id); - xbt_free(extra); - - } else { - THROW_IMPOSSIBLE; - } -} - - -PopStateEvent::PopStateEvent (double timestamp, container_t container, type_t type) -{ - 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); -} - -void PopStateEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << type->id - << " " << container->id; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -ResetStateEvent::ResetStateEvent (double timestamp, container_t container, type_t type) -{ - 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); -} - -void ResetStateEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << type->id - << " " << container->id; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -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) + print_row(); + + if (extra_ != nullptr) { + if (static_cast(extra_)->sendcounts != nullptr) + xbt_free(static_cast(extra_)->sendcounts); + if (static_cast(extra_)->recvcounts != nullptr) + xbt_free(static_cast(extra_)->recvcounts); + xbt_free(extra_); + } + } else if (instr_fmt_type == instr_fmt_TI) { + if (extra_ == nullptr) + return; + instr_extra_data extra = (instr_extra_data)extra_; + + char* process_id = nullptr; + // FIXME: dirty extract "rank-" from the name, as we want the bare process id here + if (strstr(container->name_.c_str(), "rank-") == nullptr) + process_id = xbt_strdup(container->name_.c_str()); + else + process_id = xbt_strdup(container->name_.c_str() + 5); + + FILE* trace_file = tracing_files.at(container); + + switch (extra->type) { + case TRACING_INIT: + fprintf(trace_file, "%s init\n", process_id); + break; + case TRACING_FINALIZE: + fprintf(trace_file, "%s finalize\n", process_id); + break; + case TRACING_SEND: + fprintf(trace_file, "%s send %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1); + break; + case TRACING_ISEND: + fprintf(trace_file, "%s Isend %d %d %s\n", process_id, extra->dst, extra->send_size, extra->datatype1); + break; + case TRACING_RECV: + fprintf(trace_file, "%s recv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1); + break; + case TRACING_IRECV: + fprintf(trace_file, "%s Irecv %d %d %s\n", process_id, extra->src, extra->send_size, extra->datatype1); + break; + case TRACING_TEST: + fprintf(trace_file, "%s test\n", process_id); + break; + case TRACING_WAIT: + fprintf(trace_file, "%s wait\n", process_id); + break; + case TRACING_WAITALL: + fprintf(trace_file, "%s waitAll\n", process_id); + break; + case TRACING_BARRIER: + fprintf(trace_file, "%s barrier\n", process_id); + break; + case TRACING_BCAST: // rank bcast size (root) (datatype) + fprintf(trace_file, "%s bcast %d ", process_id, extra->send_size); + if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, ""))) + fprintf(trace_file, "%d %s", extra->root, extra->datatype1); + fprintf(trace_file, "\n"); + break; + case TRACING_REDUCE: // rank reduce comm_size comp_size (root) (datatype) + fprintf(trace_file, "%s reduce %d %f ", process_id, extra->send_size, extra->comp_size); + if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, ""))) + fprintf(trace_file, "%d %s", extra->root, extra->datatype1); + fprintf(trace_file, "\n"); + break; + case TRACING_ALLREDUCE: // rank allreduce comm_size comp_size (datatype) + fprintf(trace_file, "%s allReduce %d %f %s\n", process_id, extra->send_size, extra->comp_size, + extra->datatype1); + break; + case TRACING_ALLTOALL: // rank alltoall send_size recv_size (sendtype) (recvtype) + fprintf(trace_file, "%s allToAll %d %d %s %s\n", process_id, extra->send_size, extra->recv_size, + extra->datatype1, extra->datatype2); + break; + case TRACING_ALLTOALLV: // rank alltoallv send_size [sendcounts] recv_size [recvcounts] (sendtype) (recvtype) + fprintf(trace_file, "%s allToAllV %d ", process_id, extra->send_size); + for (int i = 0; i < extra->num_processes; i++) + fprintf(trace_file, "%d ", extra->sendcounts[i]); + fprintf(trace_file, "%d ", extra->recv_size); + for (int i = 0; i < extra->num_processes; i++) + fprintf(trace_file, "%d ", extra->recvcounts[i]); + fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2); + break; + case TRACING_GATHER: // rank gather send_size recv_size root (sendtype) (recvtype) + fprintf(trace_file, "%s gather %d %d %d %s %s\n", process_id, extra->send_size, extra->recv_size, extra->root, + extra->datatype1, extra->datatype2); + break; + case TRACING_ALLGATHERV: // rank allgatherv send_size [recvcounts] (sendtype) (recvtype) + fprintf(trace_file, "%s allGatherV %d ", process_id, extra->send_size); + for (int i = 0; i < extra->num_processes; i++) + fprintf(trace_file, "%d ", extra->recvcounts[i]); + fprintf(trace_file, "%s %s \n", extra->datatype1, extra->datatype2); + break; + case TRACING_REDUCE_SCATTER: // rank reducescatter [recvcounts] comp_size (sendtype) + fprintf(trace_file, "%s reduceScatter ", process_id); + for (int i = 0; i < extra->num_processes; i++) + fprintf(trace_file, "%d ", extra->recvcounts[i]); + fprintf(trace_file, "%f %s\n", extra->comp_size, extra->datatype1); + break; + case TRACING_COMPUTING: + fprintf(trace_file, "%s compute %f\n", process_id, extra->comp_size); + break; + case TRACING_SLEEPING: + fprintf(trace_file, "%s sleep %f\n", process_id, extra->sleep_duration); + break; + case TRACING_GATHERV: // rank gatherv send_size [recvcounts] root (sendtype) (recvtype) + fprintf(trace_file, "%s gatherV %d ", process_id, extra->send_size); + for (int i = 0; i < extra->num_processes; i++) + 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_SCAN: + case TRACING_EXSCAN: + case TRACING_COMM_SIZE: + case TRACING_COMM_SPLIT: + case TRACING_COMM_DUP: + case TRACING_SSEND: + case TRACING_ISSEND: + default: + XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", value->getCname()); + break; + } + + if (extra->recvcounts != nullptr) + xbt_free(extra->recvcounts); + if (extra->sendcounts != nullptr) + xbt_free(extra->sendcounts); + xbt_free(process_id); + xbt_free(extra); + + } else { + THROW_IMPOSSIBLE; + } +} + +simgrid::instr::PopStateEvent::PopStateEvent(double timestamp, container_t container, Type* type) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_PopState) +{ + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); +} + +void simgrid::instr::PopStateEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } +} + +simgrid::instr::ResetStateEvent::ResetStateEvent(double timestamp, container_t container, Type* type) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_ResetState) +{ + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); + delete[] this; +} + +void simgrid::instr::ResetStateEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } +} + +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) -{ - 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); -} - -void StartLinkEvent::print() { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " <id - << " " <id - << " " <id - << " " << key; - - if (TRACE_display_sizes()) { - stream << " " << size; - } - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -EndLinkEvent::EndLinkEvent (double timestamp, container_t container, type_t type, container_t destContainer, - const char *value, const char *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); -} - - -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); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " <id - << " " <id - << " " <id - << " " << key; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -NewEvent::NewEvent (double timestamp, container_t container, type_t type, val_t value) -{ - this->event_type = PAJE_NewEvent; - 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); -} - -void NewEvent::print () { - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)event_type, TRACE_precision(), timestamp); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << (int)this->event_type; - print_timestamp(this); - stream << " " << type->id - << " " << container->id - << " " << value->id; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } +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) +{ + XBT_DEBUG("%s: event_type=%d, timestamp=%f, value:%s", __FUNCTION__, (int)eventType_, this->timestamp_, this->value_.c_str()); + insertIntoBuffer(); +} + +void simgrid::instr::StartLinkEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_ << " " << value_; + stream << " " << sourceContainer_->id_ << " " << key_; + + if (TRACE_display_sizes()) { + stream << " " << size_; + } + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } +} + +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) +{ + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + insertIntoBuffer(); +} + +void simgrid::instr::EndLinkEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_ << " " << value; + stream << " " << destContainer->id_ << " " << key; + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } +} + +simgrid::instr::NewEvent::NewEvent(double timestamp, container_t container, Type* type, Value* val) + : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_NewEvent) +{ + this->val = val; + + XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); + + insertIntoBuffer(); } +void simgrid::instr::NewEvent::print() +{ + if (instr_fmt_type == instr_fmt_paje) { + XBT_DEBUG("%s: event_type=%d, timestamp=%.*f", __FUNCTION__, (int)eventType_, TRACE_precision(), timestamp_); + stream << std::fixed << std::setprecision(TRACE_precision()); + stream << (int)this->eventType_; + print_timestamp(this); + stream << " " << type->getId() << " " << container->id_ << " " << val->getId(); + print_row(); + } else if (instr_fmt_type == instr_fmt_TI) { + /* Nothing to do */ + } else { + THROW_IMPOSSIBLE; + } +} void TRACE_TI_start() { @@ -998,9 +743,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); } -