X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f36bb244f8e4874b90572ecb44ed6e2f3fa9592b..d011cb8a5566e78daba9b90c6a370dca07b74c5a:/src/instr/instr_paje_events.hpp diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp index eb4041ef48..d1004b16eb 100644 --- a/src/instr/instr_paje_events.hpp +++ b/src/instr/instr_paje_events.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2019. 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. */ @@ -7,6 +7,7 @@ #define INSTR_PAJE_EVENTS_HPP #include "src/instr/instr_private.hpp" +#include "src/internal_config.h" #include #include @@ -53,11 +54,11 @@ public: }; class VariableEvent : public PajeEvent { - double value; + double value_; public: VariableEvent(double timestamp, Container* container, Type* type, e_event_type event_type, double value) - : PajeEvent::PajeEvent(container, type, timestamp, event_type), value(value) + : PajeEvent::PajeEvent(container, type, timestamp, event_type), value_(value) { } void print() override; @@ -65,9 +66,11 @@ public: class StateEvent : public PajeEvent { EntityValue* value; +#if HAVE_SMPI std::string filename = "(null)"; int linenumber = -1; - TIData* extra_; +#endif + std::unique_ptr extra_; public: StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value, TIData* extra); @@ -81,8 +84,8 @@ class LinkEvent : public PajeEvent { int size_ = -1; public: - LinkEvent(Container* container, Type* type, e_event_type event_type, Container* sourceContainer, std::string value, - std::string key, int size) + LinkEvent(Container* container, Type* type, e_event_type event_type, Container* sourceContainer, + const std::string& value, const std::string& key, int size) : PajeEvent(container, type, SIMIX_get_clock(), event_type) , endpoint_(sourceContainer) , value_(value)