-/* 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 <sstream>
#include <vector>
static std::stringstream stream;
FILE *tracing_file = nullptr;
-static xbt_dict_t tracing_files = nullptr; // TI specific
+static std::map<container_t, FILE*> tracing_files; // TI specific
static double prefix=0.0; // TI specific
std::vector<simgrid::instr::PajeEvent*> buffer;
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 {
}
}
-
void LogContainerCreation (container_t container)
{
double timestamp = SIMIX_get_clock();
// 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
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;
}
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_);
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_);
}
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_);
}
}
-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")) {
stream << (int)this->eventType_;
print_timestamp(this);
stream << " " << type->id_ << " " << container->id_;
- stream << " " << val->id_;
+ stream << " " << value->id_;
#if HAVE_SMPI
if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
stream << " \"" << filename << "\" " << linenumber;
}
}
-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")) {
stream << (int)this->eventType_;
print_timestamp(this);
stream << " " << type->id_ << " " << container->id_;
- stream << " " << val->id_;
+ stream << " " << value->id_;
if (TRACE_display_sizes()) {
stream << " ";
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:
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:
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->name_);
break;
}
}
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_);
}
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_);
}
}
-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)
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);
}
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) {
}
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) {
}
}
-
void TRACE_TI_start()
{
char *filename = TRACE_get_filename();
void TRACE_TI_end()
{
- xbt_dict_free(&tracing_files);
fclose(tracing_file);
char *filename = TRACE_get_filename();
XBT_DEBUG("Filename %s is closed", filename);
}
-
