-/* Copyright (c) 2010-2018. The SimGrid Team.
+/* Copyright (c) 2010-2019. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
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<simgrid::instr::PajeEvent*> buffer;
-void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf);
+static std::vector<simgrid::instr::PajeEvent*> buffer;
-void dump_comment(std::string comment)
+void dump_comment(const 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)
+void dump_comment_file(const 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;
delete event;
}
buffer.clear();
- }else{
+ } else {
std::vector<simgrid::instr::PajeEvent*>::iterator i = buffer.begin();
for (auto const& event : buffer) {
double head_timestamp = event->timestamp_;
XBT_DEBUG("%s: ends", __func__);
}
-void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf)
+static void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf)
{
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("<<<<<<");
}
/* 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)", __func__, eventType_, timestamp_, buffer.size());
std::vector<simgrid::instr::PajeEvent*>::reverse_iterator i;
for (i = buffer.rbegin(); i != buffer.rend(); ++i) {
else
XBT_DEBUG("%s: inserted at pos= %zd from its end", __func__, std::distance(buffer.rbegin(), i));
buffer.insert(i.base(), this);
-
- buffer_debug(&buffer);
}