Update copyright lines for 2022.

[simgrid.git] / src / instr / instr_private.hpp

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 61f2e68..2ba75f5 100644 (file)
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2022. 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. */
@@ -119,13 +119,13 @@ public:
 // CollTI: bcast, reduce, allreduce, gather, scatter, allgather, alltoall
 class CollTIData : public TIData {
   int root_;
-  int send_size_;
-  int recv_size_;
+  size_t send_size_;
+  size_t recv_size_;
   std::string send_type_;
   std::string recv_type_;
 
 public:
-  CollTIData(const std::string& name, int root, double amount, int send_size, int recv_size,
+  CollTIData(const std::string& name, int root, double amount, size_t send_size, size_t recv_size,
              const std::string& send_type, const std::string& recv_type)
       : TIData(name, amount)
       , root_(root)
@@ -138,7 +138,7 @@ public:
   {
     std::stringstream stream;
     stream << get_name() << " " << send_size_ << " ";
-    if (recv_size_ >= 0)
+    if (recv_size_ > 0)
       stream << recv_size_ << " ";
     if (get_amount() >= 0.0)
       stream << get_amount() << " ";
@@ -154,16 +154,16 @@ public:
 // VarCollTI: gatherv, scatterv, allgatherv, alltoallv (+ reducescatter out of laziness)
 class VarCollTIData : public TIData {
   int root_;
-  size_t send_size_;
+  long int send_size_;
   std::shared_ptr<std::vector<int>> sendcounts_;
-  size_t recv_size_;
+  long int recv_size_;
   std::shared_ptr<std::vector<int>> recvcounts_;
   std::string send_type_;
   std::string recv_type_;
 
 public:
-  VarCollTIData(const std::string& name, int root, size_t send_size, std::shared_ptr<std::vector<int>> sendcounts,
-                size_t recv_size, std::shared_ptr<std::vector<int>> recvcounts, const std::string& send_type,
+  VarCollTIData(const std::string& name, int root, long int send_size, std::shared_ptr<std::vector<int>> sendcounts,
+                long int recv_size, std::shared_ptr<std::vector<int>> recvcounts, const std::string& send_type,
                 const std::string& recv_type)
       : TIData(name)
       , root_(root)
@@ -178,12 +178,12 @@ public:
   {
     std::stringstream stream;
     stream << get_name() << " ";
-    if (send_size_ > 0)
+    if (send_size_ > -1)
       stream << send_size_ << " ";
     if (sendcounts_ != nullptr)
       for (auto count : *sendcounts_)
         stream << count << " ";
-    if (recv_size_ > 0)
+    if (recv_size_ > -1)
       stream << recv_size_ << " ";
     if (recvcounts_ != nullptr)
       for (auto count : *recvcounts_)
@@ -265,9 +265,9 @@ XBT_PUBLIC bool TRACE_smpi_view_internals();
 
 /* instr_paje.c */
 void instr_new_variable_type(const std::string& new_typename, const std::string& color);
-void instr_new_user_variable_type(const std::string& father_type, const std::string& new_typename,
+void instr_new_user_variable_type(const std::string& parent_type, const std::string& new_typename,
                                   const std::string& color);
-void instr_new_user_state_type(const std::string& father_type, const std::string& new_typename);
+void instr_new_user_state_type(const std::string& parent_type, const std::string& new_typename);
 void instr_new_value_for_user_state_type(const std::string& new_typename, const char* value, const std::string& color);
 
 XBT_PRIVATE void TRACE_help();