Convert int -> size_t for TRACE_smpi_send (and below).

diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp
index 24f58ab..d32bb12 100644 (file)
--- a/src/instr/instr_paje_events.cpp
+++ b/src/instr/instr_paje_events.cpp
@@ -46,7 +46,7 @@ void LinkEvent::print()
 {
   stream_ << " " << value_ << " " << endpoint_->get_id() << " " << key_;
 
-  if (TRACE_display_sizes() && size_ != -1)
+  if (TRACE_display_sizes() && size_ != static_cast<size_t>(-1))
     stream_ << " " << size_;
 }
 

diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp
index 266f328..bfb79da 100644 (file)
--- a/src/instr/instr_paje_events.hpp
+++ b/src/instr/instr_paje_events.hpp
@@ -95,11 +95,11 @@ class LinkEvent : public PajeEvent {
   Container* endpoint_;
   std::string value_;
   std::string key_;
-  int size_ = -1;
+  size_t size_;
 
 public:
   LinkEvent(Container* container, Type* type, PajeEventType event_type, Container* sourceContainer,
-            const std::string& value, const std::string& key, int size)
+            const std::string& value, const std::string& key, size_t size = static_cast<size_t>(-1))
       : PajeEvent(container, type, SIMIX_get_clock(), event_type)
       , endpoint_(sourceContainer)
       , value_(value)

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index e0f50de..26658b9 100644 (file)
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -96,19 +96,14 @@ void VariableType::sub_event(double timestamp, double value)
   events_.push_back(new VariableEvent(timestamp, get_issuer(), this, PajeEventType::SubVariable, value));
 }
 
-void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key)
-{
-  start_event(startContainer, value, key, -1);
-}
-
-void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key, int size)
+void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key, size_t size)
 {
   new LinkEvent(get_issuer(), this, PajeEventType::StartLink, startContainer, value, key, size);
 }
 
 void LinkType::end_event(Container* endContainer, const std::string& value, const std::string& key)
 {
-  new LinkEvent(get_issuer(), this, PajeEventType::EndLink, endContainer, value, key, -1);
+  new LinkEvent(get_issuer(), this, PajeEventType::EndLink, endContainer, value, key);
 }
 
 Type* Type::by_name(const std::string& name)

diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp
index e932eb9..a5e31d4 100644 (file)
--- a/src/instr/instr_paje_types.hpp
+++ b/src/instr/instr_paje_types.hpp
@@ -101,8 +101,8 @@ public:
   {
     on_creation(*this, *source, *dest);
   }
-  void start_event(Container* startContainer, const std::string& value, const std::string& key);
-  void start_event(Container* startContainer, const std::string& value, const std::string& key, int size);
+  void start_event(Container* startContainer, const std::string& value, const std::string& key,
+                   size_t size = static_cast<size_t>(-1));
   void end_event(Container* endContainer, const std::string& value, const std::string& key);
 };
 

diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp
index 9106edb..8493fc7 100644 (file)
--- a/src/instr/instr_smpi.hpp
+++ b/src/instr/instr_smpi.hpp
@@ -18,7 +18,7 @@ XBT_PRIVATE void TRACE_smpi_sleeping_out(aid_t pid);
 XBT_PRIVATE void TRACE_smpi_sleeping_in(aid_t pid, double duration);
 XBT_PRIVATE void TRACE_smpi_comm_in(aid_t pid, const char* operation, simgrid::instr::TIData* extra);
 XBT_PRIVATE void TRACE_smpi_comm_out(aid_t pid);
-XBT_PRIVATE void TRACE_smpi_send(aid_t rank, aid_t src, aid_t dst, int tag, int size);
+XBT_PRIVATE void TRACE_smpi_send(aid_t rank, aid_t src, aid_t dst, int tag, size_t size);
 XBT_PRIVATE void TRACE_smpi_recv(aid_t src, aid_t dst, int tag);
 XBT_PRIVATE void TRACE_smpi_init(aid_t pid, const std::string& calling_func);
 

diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp
index 7663c7d..d58b680 100644 (file)
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -211,7 +211,7 @@ void TRACE_smpi_comm_out(aid_t pid)
     smpi_container(pid)->get_state("MPI_STATE")->pop_event();
 }
 
-void TRACE_smpi_send(aid_t rank, aid_t src, aid_t dst, int tag, int size)
+void TRACE_smpi_send(aid_t rank, aid_t src, aid_t dst, int tag, size_t size)
 {
   if (not TRACE_smpi_is_enabled())
     return;