X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a1ea70a418f393ca1677074e928c664022295bd..cee8b7d98f1c3b6738ad5f0b20de7bed9ba08d5a:/src/instr/instr_private.hpp

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index d85287fa98..f289b78b09 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2020. 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. */
@@ -14,7 +14,6 @@
 #include "src/instr/instr_paje_events.hpp"
 #include "src/instr/instr_paje_types.hpp"
 #include "src/instr/instr_paje_values.hpp"
-#include "xbt/graph.h"
 
 #include <fstream>
 #include <iomanip> /** std::setprecision **/
@@ -25,8 +24,6 @@
 #include <sstream>
 #include <string>
 
-typedef simgrid::instr::Container* container_t;
-
 namespace simgrid {
 namespace instr {
 namespace paje {
@@ -47,13 +44,9 @@ extern TraceFormat trace_format;
 extern int trace_precision;
 extern double last_timestamp_to_dump;
 
-long long int new_paje_id();
-
 void init();
 void define_callbacks();
 
-void platform_graph_export_graphviz(const std::string& output_filename);
-
 void resource_set_utilization(const char* type, const char* name, const char* resource, const std::string& category,
                               double value, double now, double delta);
 void dump_buffer(bool force);
@@ -63,48 +56,8 @@ class TIData {
   double amount_ = 0;
 
 public:
-  int endpoint                 = 0;
-  int send_size                = 0;
-  std::shared_ptr<std::vector<int>> sendcounts = nullptr;
-  int recv_size                = 0;
-  std::shared_ptr<std::vector<int>> recvcounts = nullptr;
-  std::string send_type        = "";
-  std::string recv_type        = "";
-
-  // NoOpTI: init, finalize, test, wait, barrier
   explicit TIData(const std::string& name) : name_(name){};
-  // CPuTI: compute, sleep (+ waitAny and waitall out of laziness)
   explicit TIData(const std::string& name, double amount) : name_(name), amount_(amount){};
-  // Pt2PtTI: send, isend, ssend, issend, recv, irecv
-  explicit TIData(const std::string& name, int endpoint, int size, const std::string& datatype)
-      : name_(name), endpoint(endpoint), send_size(size), send_type(datatype){};
-  // CollTI: bcast, reduce, allreduce, gather, scatter, allgather, alltoall
-  explicit TIData(const std::string& name, int root, double amount, int send_size, int recv_size,
-                  const std::string& send_type, const std::string& recv_type)
-      : name_(name)
-      , amount_(amount)
-      , endpoint(root)
-      , send_size(send_size)
-      , recv_size(recv_size)
-      , send_type(send_type)
-      , recv_type(recv_type){};
-  // VarCollTI: gatherv, scatterv, allgatherv, alltoallv (+ reducescatter out of laziness)
-  explicit TIData(const std::string& name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
-                  std::vector<int>* recvcounts, const std::string& send_type, const std::string& recv_type)
-      : TIData(name, root, send_size, std::shared_ptr<std::vector<int>>(sendcounts), recv_size,
-               std::shared_ptr<std::vector<int>>(recvcounts), send_type, recv_type){};
-
-  explicit TIData(const std::string& name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
-                  int recv_size, std::shared_ptr<std::vector<int>> recvcounts, const std::string& send_type,
-                  const std::string& recv_type)
-      : name_(name)
-      , endpoint(root)
-      , send_size(send_size)
-      , sendcounts(sendcounts)
-      , recv_size(recv_size)
-      , recvcounts(recvcounts)
-      , send_type(send_type)
-      , recv_type(recv_type){};
 
   virtual ~TIData() = default;
 
@@ -114,16 +67,22 @@ public:
   virtual std::string display_size() = 0;
 };
 
+// NoOpTI: init, finalize, test, wait, barrier
 class NoOpTIData : public TIData {
+  explicit NoOpTIData(const std::string&, double); // disallow this constructor inherited from TIData
+
 public:
-  explicit NoOpTIData(const std::string& name) : TIData(name){};
+  using TIData::TIData;
   std::string print() override { return get_name(); }
   std::string display_size() override { return "NA"; }
 };
 
+// CPuTI: compute, sleep (+ waitAny and waitall out of laziness)
 class CpuTIData : public TIData {
+  explicit CpuTIData(const std::string&); // disallow this constructor inherited from TIData
+
 public:
-  explicit CpuTIData(const std::string& name, double amount) : TIData(name, amount){};
+  using TIData::TIData;
   std::string print() override
   {
     std::stringstream stream;
@@ -133,79 +92,107 @@ public:
   std::string display_size() override { return std::to_string(get_amount()); }
 };
 
+// Pt2PtTI: send, isend, ssend, issend, recv, irecv
 class Pt2PtTIData : public TIData {
-  int tag = 0;
+  int endpoint_;
+  size_t size_;
+  std::string type_;
+  int tag_ = 0;
 
 public:
-  explicit Pt2PtTIData(const std::string& name, int endpoint, int size, int tag, const std::string& datatype)
-      : TIData(name, endpoint, size, datatype), tag(tag){};
+  Pt2PtTIData(const std::string& name, int endpoint, size_t size, const std::string& datatype)
+      : TIData(name), endpoint_(endpoint), size_(size), type_(datatype){};
+  Pt2PtTIData(const std::string& name, int endpoint, size_t size, int tag, const std::string& datatype)
+      : TIData(name), endpoint_(endpoint), size_(size), type_(datatype), tag_(tag){};
 
-  explicit Pt2PtTIData(const std::string& name, int endpoint, int size, const std::string& datatype)
-      : TIData(name, endpoint, size, datatype){};
   std::string print() override
   {
     std::stringstream stream;
-    stream << get_name() << " " << endpoint << " ";
-    stream << tag << " " << send_size << " " << send_type;
+    stream << get_name() << " " << endpoint_ << " " << tag_ << " " << size_ << " " << type_;
     return stream.str();
   }
-  std::string display_size() override { return std::to_string(send_size); }
+  std::string display_size() override { return std::to_string(size_); }
 };
 
+// CollTI: bcast, reduce, allreduce, gather, scatter, allgather, alltoall
 class CollTIData : public TIData {
+  int root_;
+  size_t send_size_;
+  size_t recv_size_;
+  std::string send_type_;
+  std::string recv_type_;
+
 public:
-  explicit CollTIData(const std::string& name, int root, double amount, int send_size, int recv_size,
-                      const std::string& send_type, const std::string& recv_type)
-      : TIData(name, root, amount, send_size, recv_size, send_type, recv_type){};
+  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)
+      , send_size_(send_size)
+      , recv_size_(recv_size)
+      , send_type_(send_type)
+      , recv_type_(recv_type){};
+
   std::string print() override
   {
     std::stringstream stream;
-    stream << get_name() << " " << send_size << " ";
-    if (recv_size >= 0)
-      stream << recv_size << " ";
+    stream << get_name() << " " << send_size_ << " ";
+    if (recv_size_ > 0)
+      stream << recv_size_ << " ";
     if (get_amount() >= 0.0)
       stream << get_amount() << " ";
-    if (endpoint > 0 || (endpoint == 0 && not send_type.empty()))
-      stream << endpoint << " ";
-    stream << send_type << " " << recv_type;
+    if (root_ > 0 || (root_ == 0 && not send_type_.empty()))
+      stream << root_ << " ";
+    stream << send_type_ << " " << recv_type_;
 
     return stream.str();
   }
-  std::string display_size() override { return std::to_string(send_size); }
+  std::string display_size() override { return std::to_string(send_size_); }
 };
 
+// VarCollTI: gatherv, scatterv, allgatherv, alltoallv (+ reducescatter out of laziness)
 class VarCollTIData : public TIData {
-public:
-  explicit VarCollTIData(const std::string& name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
-                         std::vector<int>* recvcounts, const std::string& send_type, const std::string& recv_type)
-      : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){};
+  int root_;
+  long int send_size_;
+  std::shared_ptr<std::vector<int>> sendcounts_;
+  long int recv_size_;
+  std::shared_ptr<std::vector<int>> recvcounts_;
+  std::string send_type_;
+  std::string recv_type_;
 
-  explicit VarCollTIData(const std::string& name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
-                         int recv_size, std::shared_ptr<std::vector<int>> recvcounts, const std::string& send_type,
-                         const std::string& recv_type)
-      : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){};
+public:
+  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)
+      , send_size_(send_size)
+      , sendcounts_(sendcounts)
+      , recv_size_(recv_size)
+      , recvcounts_(recvcounts)
+      , send_type_(send_type)
+      , recv_type_(recv_type){};
 
   std::string print() override
   {
     std::stringstream stream;
     stream << get_name() << " ";
-    if (send_size >= 0)
-      stream << send_size << " ";
-    if (sendcounts != nullptr)
-      for (auto count : *sendcounts)
+    if (send_size_ > -1)
+      stream << send_size_ << " ";
+    if (sendcounts_ != nullptr)
+      for (auto count : *sendcounts_)
         stream << count << " ";
-    if (recv_size >= 0)
-      stream << recv_size << " ";
-    if (recvcounts != nullptr)
-      for (auto count : *recvcounts)
+    if (recv_size_ > -1)
+      stream << recv_size_ << " ";
+    if (recvcounts_ != nullptr)
+      for (auto count : *recvcounts_)
         stream << count << " ";
-    if (endpoint > 0 || (endpoint == 0 && not send_type.empty()))
-      stream << endpoint << " ";
-    stream << send_type << " " << recv_type;
+    if (root_ > 0 || (root_ == 0 && not send_type_.empty()))
+      stream << root_ << " ";
+    stream << send_type_ << " " << recv_type_;
 
     return stream.str();
   }
-  std::string display_size() override { return std::to_string(send_size > 0 ? send_size : recv_size); }
+  std::string display_size() override { return std::to_string(send_size_ > 0 ? send_size_ : recv_size_); }
 };
 
 /**
@@ -213,37 +200,34 @@ public:
  * to identify this request. We do this by searching for a request identified by (src, dest, tag).
  */
 class WaitTIData : public TIData {
-  int src;
-  int dest;
-  int tag;
+  int src_;
+  int dest_;
+  int tag_;
 
 public:
-  explicit WaitTIData(int src, int dest, int tag) : TIData("wait"), src(src), dest(dest), tag(tag){};
+  WaitTIData(const std::string& name, int src, int dest, int tag) : TIData(name), src_(src), dest_(dest), tag_(tag){};
 
   std::string print() override
   {
     std::stringstream stream;
-    stream << get_name() << " " << src << " " << dest << " " << tag;
-
+    stream << get_name() << " " << src_ << " " << dest_ << " " << tag_;
     return stream.str();
   }
-
   std::string display_size() override { return "NA"; }
 };
 
 class AmpiMigrateTIData : public TIData {
-  size_t memory_consumption;
+  size_t memory_consumption_;
+
 public:
-  explicit AmpiMigrateTIData(size_t memory_conso) : TIData("migrate"), memory_consumption(memory_conso) { };
+  explicit AmpiMigrateTIData(size_t memory_conso) : TIData("migrate"), memory_consumption_(memory_conso){};
 
   std::string print() override
   {
     std::stringstream stream;
-    stream << get_name() << " " << memory_consumption;
-
+    stream << get_name() << " " << memory_consumption_;
     return stream.str();
   }
-
   std::string display_size() override { return "NA"; }
 };
 } // namespace instr
@@ -251,11 +235,11 @@ public:
 
 XBT_PRIVATE std::string instr_pid(simgrid::s4u::Actor const& proc);
 
-extern XBT_PRIVATE std::set<std::string> created_categories;
-extern XBT_PRIVATE std::set<std::string> declared_marks;
-extern XBT_PRIVATE std::set<std::string> user_host_variables;
-extern XBT_PRIVATE std::set<std::string> user_vm_variables;
-extern XBT_PRIVATE std::set<std::string> user_link_variables;
+extern XBT_PRIVATE std::set<std::string, std::less<>> created_categories;
+extern XBT_PRIVATE std::set<std::string, std::less<>> declared_marks;
+extern XBT_PRIVATE std::set<std::string, std::less<>> user_host_variables;
+extern XBT_PRIVATE std::set<std::string, std::less<>> user_vm_variables;
+extern XBT_PRIVATE std::set<std::string, std::less<>> user_link_variables;
 
 /* from instr_config.c */
 XBT_PRIVATE bool TRACE_needs_platform();
@@ -279,9 +263,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();