X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..6570fa4001065f73218c9869364aba76b91de04e:/src/instr/instr_private.hpp?ds=sidebyside

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 35e9893ac2..16605e42d7 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. */
@@ -29,6 +29,11 @@ typedef simgrid::instr::Container* container_t;
 
 namespace simgrid {
 namespace instr {
+void init();
+void define_callbacks();
+
+void resource_set_utilization(const char* type, const char* name, const char* resource, const std::string& category,
+                              double value, double now, double delta);
 
 /* Format of TRACING output.
  *   - paje is the regular format, that we all know
@@ -56,7 +61,7 @@ public:
   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, sssend, issend, recv, irecv
+  // 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
@@ -115,13 +120,14 @@ public:
 };
 
 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;
@@ -264,32 +270,23 @@ 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);
+void instr_routing_platform_graph_export_graphviz(const s_xbt_graph_t* g, const char* filename);
 
 #endif