X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3d08dd00246eb26ced68c5b0e046096706bbe23..d2d824f563b6a7cc2fb7c8d618c893c8084ab334:/src/instr/instr_paje_trace.cpp diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index 8d10295cb1..bc855cb009 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 "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,7 +24,7 @@ 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 std::vector buffer; @@ -213,19 +213,18 @@ void LogContainerTypeDefinition(simgrid::instr::Type* type) void LogVariableTypeDefinition(simgrid::instr::Type* type) { - 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__, simgrid::instr::PAJE_DefineVariableType, - TRACE_precision(), 0.); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << simgrid::instr::PAJE_DefineVariableType; - stream << " " << type->id_ << " " << type->father_->id_ << " " << type->name_; - if (type->color_) - stream << " \"" << type->color_ << "\""; - print_row(); + 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 << " " << 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 { @@ -286,16 +285,16 @@ if (instr_fmt_type == instr_fmt_paje) { } } -void LogEntityValue(simgrid::instr::Value* val) +void simgrid::instr::Value::print() { XBT_DEBUG("%s: event_type=%d", __FUNCTION__, simgrid::instr::PAJE_DefineEntityValue); //print it if (instr_fmt_type == instr_fmt_paje) { stream << std::fixed << std::setprecision(TRACE_precision()); stream << simgrid::instr::PAJE_DefineEntityValue; - stream << " " << val->id_ << " " << val->father_->id_ << " " << val->name_; - if (val->color_) - stream << " \"" << val->color_ << "\""; + stream << " " << id_ << " " << father_->id_ << " " << name_; + if (isColored()) + stream << " \"" << color_ << "\""; print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -304,7 +303,6 @@ if (instr_fmt_type == instr_fmt_paje) { } } - void LogContainerCreation (container_t container) { double timestamp = SIMIX_get_clock(); @@ -328,15 +326,14 @@ void LogContainerCreation (container_t container) // 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 @@ -350,7 +347,7 @@ void LogContainerCreation (container_t container) 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; } @@ -374,23 +371,21 @@ void LogContainerDestruction(container_t container) 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_); + 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; + } } simgrid::instr::SetVariableEvent::SetVariableEvent(double timestamp, container_t container, Type* type, double value) + : container(container), type(type), value(value) { this->eventType_ = PAJE_SetVariable; 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_); @@ -415,12 +410,10 @@ void simgrid::instr::SetVariableEvent::print() simgrid::instr::AddVariableEvent::AddVariableEvent(double timestamp, container_t container, simgrid::instr::Type* type, double value) + : container(container), type(type), value(value) { this->eventType_ = PAJE_AddVariable; 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_); @@ -444,12 +437,10 @@ void simgrid::instr::AddVariableEvent::print() } simgrid::instr::SubVariableEvent::SubVariableEvent(double timestamp, container_t container, Type* type, double value) + : container(container), type(type), value(value) { this->eventType_ = 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_); @@ -472,13 +463,11 @@ void simgrid::instr::SubVariableEvent::print() } } -simgrid::instr::SetStateEvent::SetStateEvent(double timestamp, container_t container, Type* type, Value* val) +simgrid::instr::SetStateEvent::SetStateEvent(double timestamp, container_t container, Type* type, Value* value) + : container(container), type(type), value(value) { this->eventType_ = PAJE_SetState; this->timestamp_ = timestamp; - this->type = type; - this->container = container; - this->val = val; #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { @@ -501,7 +490,7 @@ void simgrid::instr::SetStateEvent::print() stream << (int)this->eventType_; print_timestamp(this); stream << " " << type->id_ << " " << container->id_; - stream << " " << val->id_; + stream << " " << value->getId(); #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { stream << " \"" << filename << "\" " << linenumber; @@ -515,15 +504,12 @@ void simgrid::instr::SetStateEvent::print() } } -simgrid::instr::PushStateEvent::PushStateEvent(double timestamp, container_t container, Type* type, Value* val, +simgrid::instr::PushStateEvent::PushStateEvent(double timestamp, container_t container, Type* type, Value* value, void* extra) + : container(container), type(type), value(value), extra_(extra) { this->eventType_ = PAJE_PushState; this->timestamp_ = timestamp; - this->type = type; - this->container = container; - this->val = val; - this->extra_ = extra; #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { @@ -549,7 +535,7 @@ void simgrid::instr::PushStateEvent::print() stream << (int)this->eventType_; print_timestamp(this); stream << " " << type->id_ << " " << container->id_; - stream << " " << val->id_; + stream << " " << value->getId(); if (TRACE_display_sizes()) { stream << " "; @@ -580,12 +566,12 @@ void simgrid::instr::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: @@ -676,7 +662,8 @@ void simgrid::instr::PushStateEvent::print() 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); + 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: @@ -690,7 +677,7 @@ void simgrid::instr::PushStateEvent::print() case TRACING_SSEND: case TRACING_ISSEND: default: - XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", val->name_); + XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", value->getCname()); break; } @@ -707,11 +694,10 @@ void simgrid::instr::PushStateEvent::print() } simgrid::instr::PopStateEvent::PopStateEvent(double timestamp, container_t container, Type* type) + : container(container), type(type) { this->eventType_ = PAJE_PopState; this->timestamp_ = timestamp; - this->type = type; - this->container = container; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); @@ -735,11 +721,10 @@ void simgrid::instr::PopStateEvent::print() } simgrid::instr::ResetStateEvent::ResetStateEvent(double timestamp, container_t container, Type* type) + : container(container), type(type) { this->eventType_ = PAJE_ResetState; this->timestamp_ = timestamp; - this->type = type; - this->container = container; XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)eventType_, this->timestamp_); @@ -763,11 +748,6 @@ void simgrid::instr::ResetStateEvent::print() } } -simgrid::instr::StartLinkEvent::~StartLinkEvent() -{ - free(value); - free(key); -} simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type, container_t sourceContainer, const char* value, const char* key) : StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1) @@ -776,17 +756,17 @@ simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t con simgrid::instr::StartLinkEvent::StartLinkEvent(double timestamp, container_t container, Type* type, container_t sourceContainer, const char* value, const char* key, int size) + : container_(container) + , type_(type) + , sourceContainer_(sourceContainer) + , value_(value) + , key_(key) + , size_(size) { eventType_ = 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)eventType_, this->timestamp_, this->value); + XBT_DEBUG("%s: event_type=%d, timestamp=%f, value:%s", __FUNCTION__, (int)eventType_, this->timestamp_, this->value_.c_str()); insert_into_buffer (this); } @@ -798,11 +778,11 @@ void simgrid::instr::StartLinkEvent::print() stream << std::fixed << std::setprecision(TRACE_precision()); stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id_ << " " << container->id_ << " " << value; - stream << " " << sourceContainer->id_ << " " << key; + stream << " " << type_->id_ << " " << 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) { @@ -813,26 +793,17 @@ void simgrid::instr::StartLinkEvent::print() } simgrid::instr::EndLinkEvent::EndLinkEvent(double timestamp, container_t container, Type* type, - container_t destContainer, const char* value, const char* key) + container_t destContainer, std::string value, std::string key) + : container(container), type(type), destContainer(destContainer), value(value), key(key) { this->eventType_ = 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)eventType_, this->timestamp_); insert_into_buffer (this); } -simgrid::instr::EndLinkEvent::~EndLinkEvent() -{ - free(value); - free(key); -} void simgrid::instr::EndLinkEvent::print() { if (instr_fmt_type == instr_fmt_paje) { @@ -870,7 +841,7 @@ void simgrid::instr::NewEvent::print() stream << std::fixed << std::setprecision(TRACE_precision()); stream << (int)this->eventType_; print_timestamp(this); - stream << " " << type->id_ << " " << container->id_ << " " << val->id_; + stream << " " << type->id_ << " " << container->id_ << " " << val->getId(); print_row(); } else if (instr_fmt_type == instr_fmt_TI) { /* Nothing to do */ @@ -879,7 +850,6 @@ void simgrid::instr::NewEvent::print() } } - void TRACE_TI_start() { char *filename = TRACE_get_filename(); @@ -898,9 +868,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); } -