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

diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp
index e212b46e81..d0633285e8 100644
--- a/src/instr/instr_smpi.hpp
+++ b/src/instr/instr_smpi.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. 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. */
@@ -6,54 +6,38 @@
 #ifndef INSTR_SMPI_HPP
 #define INSTR_SMPI_HPP
 
-#ifdef __cplusplus
-#include <string>
-#endif
-
 #include "smpi/smpi.h"
 #include "src/instr/instr_private.hpp"
+#include <string>
 
-SG_BEGIN_DECL()
-
-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_collective_in(int rank, const char* operation, instr_extra_data extra);
-XBT_PRIVATE void TRACE_smpi_collective_out(int rank, const char* operation);
-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, instr_extra_data extra);
-XBT_PRIVATE void TRACE_smpi_sleeping_init(int rank);
-XBT_PRIVATE void TRACE_smpi_sleeping_out(int rank);
-XBT_PRIVATE void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra);
-XBT_PRIVATE void TRACE_smpi_testing_out(int rank);
-XBT_PRIVATE void TRACE_smpi_testing_in(int rank, instr_extra_data extra);
-XBT_PRIVATE void TRACE_smpi_alloc();
-XBT_PRIVATE void TRACE_smpi_release();
-XBT_PRIVATE void TRACE_smpi_ptp_in(int rank, const char* operation, instr_extra_data extra);
-XBT_PRIVATE void TRACE_smpi_ptp_out(int rank, int dst, const char* operation);
-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);
-XBT_PRIVATE char* smpi_container(int rank, char* container, int n);
-
-XBT_PRIVATE const char* encode_datatype(MPI_Datatype datatype, int* known);
-
-typedef struct smpi_trace_call_location {
-  const char* filename;
-  int linenumber;
-
-  const char* previous_filename;
-  int previous_linenumber;
-
-#ifdef __cplusplus
-  std::string get_composed_key() {
-    return std::string(previous_filename) + ':' + std::to_string(previous_linenumber) + ':' + filename + ':' + std::to_string(linenumber);
+/* Helper functions */
+XBT_PRIVATE simgrid::instr::Container* smpi_container(aid_t pid);
+XBT_PRIVATE void TRACE_smpi_setup_container(aid_t pid, const_sg_host_t host);
+
+XBT_PRIVATE void TRACE_smpi_sleeping_out(aid_t pid);
+XBT_PRIVATE void TRACE_smpi_sleeping_in(aid_t pid, double duration);
+XBT_PRIVATE void TRACE_smpi_comm_in(aid_t pid, const char* operation, simgrid::instr::TIData* extra);
+XBT_PRIVATE void TRACE_smpi_comm_out(aid_t pid);
+XBT_PRIVATE void TRACE_smpi_send(aid_t rank, aid_t src, aid_t dst, int tag, size_t size);
+XBT_PRIVATE void TRACE_smpi_recv(aid_t src, aid_t dst, int tag);
+XBT_PRIVATE void TRACE_smpi_init(aid_t pid, const std::string& calling_func);
+
+class smpi_trace_call_location_t {
+public:
+  std::string func_call;
+  std::string filename;
+  int linenumber = 0;
+
+  std::string previous_filename;
+  int previous_linenumber = 0;
+
+  std::string get_composed_key() const
+  {
+    return previous_filename + ':' + std::to_string(previous_linenumber) + ':' + filename + ':' +
+           std::to_string(linenumber);
   }
-#endif
-
-} smpi_trace_call_location_t;
 
-SG_END_DECL()
+  std::string get_call_location() const { return filename + ":" + std::to_string(linenumber) + ":" + func_call + "()"; }
+};
 
 #endif