X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8976bfbf1b73e13049d914169c672eabf7b63164..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/instr/instr_paje_trace.cpp diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index 0e2c89cb10..a725958bb9 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -1,49 +1,43 @@ -/* 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" #include "typeinfo" -#include "xbt/virtu.h" /* sg_cmdline */ #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system"); -static std::stringstream stream; -FILE *tracing_file = nullptr; +extern std::ofstream tracing_file; std::vector buffer; -void buffer_debug(std::vector* buf); void dump_comment(std::string comment) { - if (comment.empty()) - return; - fprintf(tracing_file, "# %s\n", comment.c_str()); + if (not comment.empty()) + tracing_file << "# " << comment << std::endl; } void dump_comment_file(std::string filename) { if (filename.empty()) return; - std::ifstream* fs = new std::ifstream(); - fs->open(filename.c_str(), std::ifstream::in); + std::ifstream fs(filename.c_str(), std::ifstream::in); - if (fs->fail()) { + if (fs.fail()) THROWF(system_error, 1, "Comment file %s could not be opened for reading.", filename.c_str()); - } - while (not fs->eof()) { + + while (not fs.eof()) { std::string line; - fprintf (tracing_file, "# "); - std::getline(*fs, line); - fprintf(tracing_file, "%s", line.c_str()); + std::getline(fs, line); + tracing_file << "# " << line; } - fs->close(); + fs.close(); } double TRACE_last_timestamp_to_dump = 0; @@ -52,14 +46,14 @@ 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(); delete event; } buffer.clear(); - }else{ + } else { std::vector::iterator i = buffer.begin(); for (auto const& event : buffer) { double head_timestamp = event->timestamp_; @@ -71,52 +65,29 @@ 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) +static 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(); - XBT_DEBUG("%p %s", event, stream.str().c_str()); - stream.str(""); - stream.clear(); + XBT_DEBUG("%p %s", event, event->stream_.str().c_str()); + event->stream_.str(""); + event->stream_.clear(); } 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() +void simgrid::instr::PajeEvent::insert_into_buffer() { - if (not TRACE_buffer()) { - print(); - delete this; - return; - } 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,94 +96,12 @@ 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); } - -void TRACE_paje_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); - } - - XBT_DEBUG("Filename %s is open for writing", filename); - - /* output generator version */ - fprintf (tracing_file, "#This file was generated using SimGrid-%d.%d.%d\n", - SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, SIMGRID_VERSION_PATCH); - fprintf (tracing_file, "#["); - unsigned int cpt; - char *str; - xbt_dynar_foreach (xbt_cmdline, cpt, str){ - fprintf(tracing_file, "%s ",str); - } - fprintf (tracing_file, "]\n"); - - /* output one line comment */ - dump_comment (TRACE_get_comment()); - - /* output comment file */ - dump_comment_file (TRACE_get_comment_file()); - - /* output header */ - TRACE_header(TRACE_basic(),TRACE_display_sizes()); -} - -void TRACE_paje_end() { - fclose(tracing_file); - char *filename = TRACE_get_filename(); - XBT_DEBUG("Filename %s is closed", filename); -} - -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(); -} - -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); - - XBT_DEBUG("Filename %s is open for writing", filename); - - /* output one line comment */ - dump_comment(TRACE_get_comment()); - - /* output comment file */ - dump_comment_file(TRACE_get_comment_file()); -} - -void TRACE_TI_end() -{ - fclose(tracing_file); - XBT_DEBUG("Filename %s is closed", TRACE_get_filename()); -}