X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/406f9bbafee691a1e31084806dc15fb292fd649b..c6e251509d3babdd3ab71eb043baf9ae8b8bee0a:/src/instr/instr_smpi.hpp

diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp
index 8a97505986..e7aa34338e 100644
--- a/src/instr/instr_smpi.hpp
+++ b/src/instr/instr_smpi.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. 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. */
@@ -11,29 +11,16 @@
 #include <string>
 
 /* Helper functions */
-XBT_PRIVATE container_t smpi_container(int rank);
-XBT_PRIVATE void TRACE_smpi_setup_container(int rank, sg_host_t host);
-
-XBT_PRIVATE void TRACE_internal_smpi_set_category(const char* category);
-XBT_PRIVATE const char* TRACE_internal_smpi_get_category();
-XBT_PRIVATE void TRACE_smpi_computing_init(int rank);
-XBT_PRIVATE void TRACE_smpi_computing_out(int rank);
-XBT_PRIVATE void TRACE_smpi_computing_in(int rank, double amount);
+XBT_PRIVATE simgrid::instr::Container* smpi_container(int rank);
+XBT_PRIVATE void TRACE_smpi_setup_container(int rank, const_sg_host_t host);
+
 XBT_PRIVATE void TRACE_smpi_sleeping_out(int rank);
 XBT_PRIVATE void TRACE_smpi_sleeping_in(int rank, double duration);
-XBT_PRIVATE void TRACE_smpi_testing_out(int rank);
-XBT_PRIVATE void TRACE_smpi_testing_in(int rank);
-XBT_PRIVATE void TRACE_smpi_release();
 XBT_PRIVATE void TRACE_smpi_comm_in(int rank, const char* operation, simgrid::instr::TIData* extra);
 XBT_PRIVATE void TRACE_smpi_comm_out(int rank);
 XBT_PRIVATE void TRACE_smpi_send(int rank, int src, int dst, int tag, int size);
 XBT_PRIVATE void TRACE_smpi_recv(int src, int dst, int tag);
-XBT_PRIVATE void TRACE_smpi_init(int rank);
-XBT_PRIVATE void TRACE_smpi_finalize(int rank);
-/* SMPI + LB (load balancer) */
-XBT_PRIVATE void TRACE_smpi_send_process_data_in(int rank);
-XBT_PRIVATE void TRACE_smpi_send_process_data_out(int rank);
-XBT_PRIVATE void TRACE_smpi_process_change_host(int rank, sg_host_t new_host);
+XBT_PRIVATE void TRACE_smpi_init(int rank, const std::string& calling_func);
 
 class smpi_trace_call_location_t {
 public:
@@ -43,7 +30,7 @@ public:
   std::string previous_filename;
   int previous_linenumber;
 
-  std::string get_composed_key()
+  std::string get_composed_key() const
   {
     return previous_filename + ':' + std::to_string(previous_linenumber) + ':' + filename + ':' +
            std::to_string(linenumber);