X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e62e76d104a17f0c9aaf9135ac605e9c8c87141..4b0fa756ae6e58a74c374a519389ecb9e8b6a4d9:/src/instr/instr_private.hpp

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 5d1b98c302..8b5c076e95 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2020. 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. */
@@ -25,10 +25,14 @@
 #include <sstream>
 #include <string>
 
-typedef simgrid::instr::Container* container_t;
-
 namespace simgrid {
 namespace instr {
+namespace paje {
+
+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
@@ -38,6 +42,19 @@ namespace instr {
  */
 enum class TraceFormat { Paje, /*TimeIndependent*/ Ti };
 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);
 
 class TIData {
   std::string name_;
@@ -87,10 +104,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;
 };
@@ -98,7 +115,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"; }
 };
 
@@ -108,24 +125,25 @@ 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 {
-  int tag;
+  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){};
 
   explicit Pt2PtTIData(const std::string& name, int endpoint, int size, const std::string& datatype)
-      : TIData(name, endpoint, size, datatype), tag(0){};
+      : TIData(name, endpoint, size, datatype){};
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " " << endpoint << " ";
+    stream << get_name() << " " << endpoint << " ";
     stream << tag << " " << send_size << " " << send_type;
     return stream.str();
   }
@@ -140,11 +158,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;
@@ -168,7 +186,7 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " ";
+    stream << get_name() << " ";
     if (send_size >= 0)
       stream << send_size << " ";
     if (sendcounts != nullptr)
@@ -203,7 +221,7 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " " << src << " " << dest << " " << tag;
+    stream << get_name() << " " << src << " " << dest << " " << tag;
 
     return stream.str();
   }
@@ -219,15 +237,15 @@ public:
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " " << memory_consumption;
+    stream << get_name() << " " << memory_consumption;
 
     return stream.str();
   }
 
   std::string display_size() override { return "NA"; }
 };
-}
-}
+} // namespace instr
+} // namespace simgrid
 
 XBT_PRIVATE std::string instr_pid(simgrid::s4u::Actor const& proc);
 
@@ -236,10 +254,6 @@ 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);
 
 /* from instr_config.c */
 XBT_PRIVATE bool TRACE_needs_platform();
@@ -252,10 +266,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_disable_destroy();
-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();
@@ -264,32 +275,13 @@ XBT_PUBLIC bool TRACE_smpi_is_computing();
 XBT_PUBLIC bool TRACE_smpi_is_sleeping();
 XBT_PUBLIC bool TRACE_smpi_view_internals();
 
-XBT_PRIVATE void TRACE_surf_resource_set_utilization(const char* type, const char* name, const char* resource,
-                                                     const std::string& category, double value, double now,
-                                                     double delta);
-
 /* instr_paje.c */
-extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;
-extern XBT_PRIVATE std::set<std::string> trivaEdgeTypes;
-XBT_PRIVATE long long int instr_new_paje_id();
-XBT_PRIVATE void instr_define_callbacks();
 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);
 void instr_new_user_state_type(const std::string& father_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_global_init();
 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 void dump_comment(const std::string& comment);
-
-XBT_PRIVATE std::string TRACE_get_filename();
-
-/* instr_platform */
-xbt_graph_t instr_routing_platform_graph();
-void instr_routing_platform_graph_export_graphviz(xbt_graph_t g, const char* filename);
-
 #endif