X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e2303ab8fb6ac8f8f7a0fbbaa73528256396a7..501b1d3f4293a4a3c27ad38fd74e995584799576:/src/instr/instr_paje_events.cpp diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp index 56d83bba19..f908770f1f 100644 --- a/src/instr/instr_paje_events.cpp +++ b/src/instr/instr_paje_events.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2023. 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. */ @@ -6,12 +6,11 @@ #include "src/instr/instr_private.hpp" #include "src/instr/instr_smpi.hpp" #include "src/smpi/include/private.hpp" -#include "src/surf/surf_interface.hpp" +#include "xbt/ex.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_events, instr, "Paje tracing event system (events)"); -namespace simgrid { -namespace instr { +namespace simgrid::instr { PajeEvent::PajeEvent(Container* container, Type* type, double timestamp, PajeEventType eventType) : container_(container), type_(type), timestamp_(timestamp), eventType_(eventType) @@ -26,7 +25,7 @@ PajeEvent::~PajeEvent() } StateEvent::StateEvent(Container* container, Type* type, PajeEventType event_type, EntityValue* value, TIData* extra) - : PajeEvent::PajeEvent(container, type, SIMIX_get_clock(), event_type), value(value), extra_(extra) + : PajeEvent::PajeEvent(container, type, simgrid_get_clock(), event_type), value(value), extra_(extra) { #if HAVE_SMPI if (smpi_cfg_trace_call_location()) { @@ -46,7 +45,7 @@ void LinkEvent::print() { stream_ << " " << value_ << " " << endpoint_->get_id() << " " << key_; - if (TRACE_display_sizes() && size_ != -1) + if (TRACE_display_sizes() && size_ != static_cast(-1)) stream_ << " " << size_; } @@ -76,12 +75,11 @@ void StateEvent::print() } #if HAVE_SMPI if (smpi_cfg_trace_call_location()) - stream_ << container_name << " location " << filename << " " << linenumber << std::endl ; + stream_ << container_name << " location " << filename << " " << linenumber << '\n'; #endif stream_ << container_name << " " << extra_->print(); } else { THROW_IMPOSSIBLE; } } -} // namespace instr -} // namespace simgrid +} // namespace simgrid::instr