X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7adf7d3cc45bf13462b257c7e3bc8a2eae2bf981..64578ee8e932a2a7e292514c0912f50fe4299220:/src/instr/instr_paje_trace.cpp diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index 255c28e299..a811e79cf6 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. +/* Copyright (c) 2010-2018. 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 "simgrid/sg_config.h" +#include "simgrid/sg_config.hpp" #include "src/instr/instr_private.hpp" #include "src/instr/instr_smpi.hpp" #include "src/smpi/include/private.hpp" @@ -52,7 +52,7 @@ 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); + XBT_DEBUG("%s: dump until %f. starts", __func__, TRACE_last_timestamp_to_dump); if (force){ for (auto const& event : buffer) { event->print(); @@ -71,12 +71,13 @@ void TRACE_paje_dump_buffer(bool force) } buffer.erase(buffer.begin(), i); } - XBT_DEBUG("%s: ends", __FUNCTION__); + XBT_DEBUG("%s: ends", __func__); } void buffer_debug(std::vector* buf) { - return; + if (not XBT_LOG_ISENABLED(instr_paje_trace, xbt_log_priority_debug)) + return; XBT_DEBUG(">>>>>> Dump the state of the buffer. %zu events", buf->size()); for (auto const& event : *buf) { event->print(); @@ -87,24 +88,6 @@ void buffer_debug(std::vector* buf) XBT_DEBUG("<<<<<<"); } -static void print_row() { - stream << std::endl; - fprintf(tracing_file, "%s", stream.str().c_str()); - XBT_DEBUG("Dump %s", stream.str().c_str()); - stream.str(""); - stream.clear(); -} - -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) - stream << 0; - else - stream << event->timestamp_; -} - /* internal do the instrumentation module */ void simgrid::instr::PajeEvent::insertIntoBuffer() { @@ -115,8 +98,7 @@ void simgrid::instr::PajeEvent::insertIntoBuffer() } buffer_debug(&buffer); - XBT_DEBUG("%s: insert event_type=%u, timestamp=%f, buffersize=%zu)", __FUNCTION__, eventType_, timestamp_, - buffer.size()); + XBT_DEBUG("%s: insert event_type=%u, timestamp=%f, buffersize=%zu)", __func__, eventType_, timestamp_, buffer.size()); std::vector::reverse_iterator i; for (i = buffer.rbegin(); i != buffer.rend(); ++i) { simgrid::instr::PajeEvent* e1 = *i; @@ -125,29 +107,24 @@ void simgrid::instr::PajeEvent::insertIntoBuffer() break; } if (i == buffer.rend()) - XBT_DEBUG("%s: inserted at beginning", __FUNCTION__); + XBT_DEBUG("%s: inserted at beginning", __func__); else if (i == buffer.rbegin()) - XBT_DEBUG("%s: inserted at end", __FUNCTION__); + XBT_DEBUG("%s: inserted at end", __func__); 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", __func__, std::distance(buffer.rbegin(), i)); buffer.insert(i.base(), this); buffer_debug(&buffer); } -simgrid::instr::PajeEvent::~PajeEvent() -{ - XBT_DEBUG("%s not implemented for %p: event_type=%u, timestamp=%f", __FUNCTION__, this, eventType_, timestamp_); -} - void TRACE_paje_start() { - char *filename = TRACE_get_filename(); - tracing_file = fopen(filename, "w"); + std::string filename = TRACE_get_filename(); + tracing_file = fopen(filename.c_str(), "w"); if (tracing_file == nullptr){ - THROWF (system_error, 1, "Tracefile %s could not be opened for writing.", filename); + THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename.c_str()); } - XBT_DEBUG("Filename %s is open for writing", filename); + XBT_DEBUG("Filename %s is open for writing", filename.c_str()); /* output generator version */ fprintf (tracing_file, "#This file was generated using SimGrid-%d.%d.%d\n", @@ -172,179 +149,19 @@ void TRACE_paje_start() { void TRACE_paje_end() { fclose(tracing_file); - char *filename = TRACE_get_filename(); - XBT_DEBUG("Filename %s is closed", filename); -} - -simgrid::instr::SetVariableEvent::SetVariableEvent(double timestamp, container_t container, Type* type, double value) - : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_SetVariable), value(value) -{ - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_); - insertIntoBuffer(); -} - -void simgrid::instr::SetVariableEvent::print() -{ - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_); - stream << std::fixed << std::setprecision(TRACE_precision()) << this->eventType_; - print_timestamp(this); - stream << " " << type->getId() << " " << container->getId() << " " << value; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -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=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_); - insertIntoBuffer(); -} - -void simgrid::instr::AddVariableEvent::print() -{ - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << eventType_; - print_timestamp(this); - stream << " " << type->getId() << " " << container->getId() << " " << value; - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} - -simgrid::instr::SubVariableEvent::SubVariableEvent(double timestamp, container_t container, Type* type, double value) - : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_SubVariable), value(value) -{ - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_); - insertIntoBuffer(); -} - -void simgrid::instr::SubVariableEvent::print() -{ - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << eventType_; - print_timestamp(this); - stream << " " << type->getId() << " " << container->getId() << " " << value; - 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) -{} - -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=%u, timestamp=%f, value:%s", __FUNCTION__, 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=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << eventType_; - print_timestamp(this); - stream << " " << type->getId() << " " << container->getId() << " " << value_; - stream << " " << sourceContainer_->getId() << " " << 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=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_); - insertIntoBuffer(); -} - -void simgrid::instr::EndLinkEvent::print() -{ - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << eventType_; - print_timestamp(this); - stream << " " << type->getId() << " " << container->getId() << " " << value; - stream << " " << destContainer->getId() << " " << 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, EntityValue* val) - : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_NewEvent), val(val) -{ - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_); - - insertIntoBuffer(); + XBT_DEBUG("Filename %s is closed", TRACE_get_filename().c_str()); } -void simgrid::instr::NewEvent::print() -{ - if (instr_fmt_type == instr_fmt_paje) { - XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_); - stream << std::fixed << std::setprecision(TRACE_precision()); - stream << eventType_; - print_timestamp(this); - stream << " " << type->getId() << " " << container->getId() << " " << val->getId(); - print_row(); - } else if (instr_fmt_type == instr_fmt_TI) { - /* Nothing to do */ - } else { - THROW_IMPOSSIBLE; - } -} void TRACE_TI_start() { - char *filename = TRACE_get_filename(); - tracing_file = fopen(filename, "w"); - if (tracing_file == nullptr) - THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename); + std::string filename = TRACE_get_filename(); + tracing_file = fopen(filename.c_str(), "w"); + if (tracing_file == nullptr) { + THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename.c_str()); + } - XBT_DEBUG("Filename %s is open for writing", filename); + XBT_DEBUG("Filename %s is open for writing", filename.c_str()); /* output one line comment */ dump_comment(TRACE_get_comment()); @@ -356,6 +173,5 @@ void TRACE_TI_start() void TRACE_TI_end() { fclose(tracing_file); - char *filename = TRACE_get_filename(); - XBT_DEBUG("Filename %s is closed", filename); + XBT_DEBUG("Filename %s is closed", TRACE_get_filename().c_str()); }