Enforce usage of std::shared_ptr for TIData.

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

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 755f349..a9c3598 100644 (file)
--- 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-2021. 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,17 +24,14 @@
 #include <sstream>
 #include <string>
 
-typedef simgrid::instr::Container* container_t;
-
 namespace simgrid {
 namespace instr {
-void init();
-void define_callbacks();
+namespace paje {
 
-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_generator_version();
+void dump_comment_file(const std::string& filename);
+void dump_header(bool basic, bool display_sizes);
+} // namespace paje
 
 /* Format of TRACING output.
  *   - paje is the regular format, that we all know
@@ -45,6 +41,17 @@ void resource_set_utilization(const char* type, const char* name, const char* re
  */
 enum class TraceFormat { Paje, /*TimeIndependent*/ Ti };
 extern TraceFormat trace_format;
+extern int trace_precision;
+extern double last_timestamp_to_dump;
+
+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);
 
 class TIData {
   std::string name_;
@@ -77,11 +84,6 @@ public:
       , 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)
@@ -94,10 +96,10 @@ public:
       , send_type(send_type)
       , recv_type(recv_type){};
 
-  virtual ~TIData() {}
+  virtual ~TIData() = default;
 
-  const std::string& getName() const { return name_; }
-  double getAmount() { return amount_; }
+  const std::string& get_name() const { return name_; }
+  double get_amount() const { return amount_; }
   virtual std::string print()        = 0;
   virtual std::string display_size() = 0;
 };
@@ -105,7 +107,7 @@ public:
 class NoOpTIData : public TIData {
 public:
   explicit NoOpTIData(const std::string& name) : TIData(name){};
-  std::string print() override { return getName(); }
+  std::string print() override { return get_name(); }
   std::string display_size() override { return "NA"; }
 };
 
@@ -115,10 +117,10 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " " << getAmount();
+    stream << get_name() << " " << get_amount();
     return stream.str();
   }
-  std::string display_size() override { return std::to_string(getAmount()); }
+  std::string display_size() override { return std::to_string(get_amount()); }
 };
 
 class Pt2PtTIData : public TIData {
@@ -133,7 +135,7 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " " << endpoint << " ";
+    stream << get_name() << " " << endpoint << " ";
     stream << tag << " " << send_size << " " << send_type;
     return stream.str();
   }
@@ -148,11 +150,11 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " " << send_size << " ";
+    stream << get_name() << " " << send_size << " ";
     if (recv_size >= 0)
       stream << recv_size << " ";
-    if (getAmount() >= 0.0)
-      stream << getAmount() << " ";
+    if (get_amount() >= 0.0)
+      stream << get_amount() << " ";
     if (endpoint > 0 || (endpoint == 0 && not send_type.empty()))
       stream << endpoint << " ";
     stream << send_type << " " << recv_type;
@@ -164,10 +166,6 @@ public:
 
 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){};
-
   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)
@@ -176,7 +174,7 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " ";
+    stream << get_name() << " ";
     if (send_size >= 0)
       stream << send_size << " ";
     if (sendcounts != nullptr)
@@ -211,7 +209,7 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " " << src << " " << dest << " " << tag;
+    stream << get_name() << " " << src << " " << dest << " " << tag;
 
     return stream.str();
   }
@@ -227,7 +225,7 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " " << memory_consumption;
+    stream << get_name() << " " << memory_consumption;
 
     return stream.str();
   }
@@ -239,15 +237,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 double TRACE_last_timestamp_to_dump;
-
-/* instr_paje_header.c */
-XBT_PRIVATE void TRACE_header(bool basic, bool size);
+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();
@@ -260,9 +254,7 @@ XBT_PRIVATE bool TRACE_actor_is_enabled();
 XBT_PRIVATE bool TRACE_vm_is_enabled();
 XBT_PRIVATE bool TRACE_disable_link();
 XBT_PRIVATE bool TRACE_disable_speed();
-XBT_PRIVATE bool TRACE_basic();
 XBT_PRIVATE bool TRACE_display_sizes();
-XBT_PRIVATE int TRACE_precision();
 
 /* Public functions used in SMPI */
 XBT_PUBLIC bool TRACE_smpi_is_enabled();
@@ -272,7 +264,6 @@ XBT_PUBLIC bool TRACE_smpi_is_sleeping();
 XBT_PUBLIC bool TRACE_smpi_view_internals();
 
 /* instr_paje.c */
-XBT_PRIVATE long long int instr_new_paje_id();
 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,
                                   const std::string& color);
@@ -281,9 +272,4 @@ void instr_new_value_for_user_state_type(const std::string& new_typename, const
 
 XBT_PRIVATE void TRACE_help();
 
-XBT_PRIVATE void TRACE_paje_dump_buffer(bool force);
-XBT_PRIVATE void dump_comment_file(const std::string& filename);
-
-XBT_PRIVATE std::string TRACE_get_filename();
-
 #endif