X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bea3ba08392e5da9dfec0119bcd0641e0f0b1a52..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/smpi/include/smpi_utils.hpp

diff --git a/src/smpi/include/smpi_utils.hpp b/src/smpi/include/smpi_utils.hpp
index 29c09185a7..f0a35b001a 100644
--- a/src/smpi/include/smpi_utils.hpp
+++ b/src/smpi/include/smpi_utils.hpp
@@ -1,38 +1,36 @@
-/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-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. */
 
 #ifndef SMPI_UTILS_HPP
 #define SMPI_UTILS_HPP
-#include "xbt/base.h"
+#include <xbt/base.h>
+
+#include "smpi_f2c.hpp"
+#include "smpi_comm.hpp"
+
 #include <cstddef>
 #include <string>
+#include <string_view>
 #include <vector>
-#include "smpi_f2c.hpp"
 
 // Methods used to parse and store the values for timing injections in smpi
-struct s_smpi_factor_t {
-  size_t factor = 0;
-  std::vector<double> values;
-};
-
-
-namespace simgrid {
-namespace smpi {
-namespace utils {
-  extern F2C* current_handle;
-  XBT_PUBLIC std::vector<s_smpi_factor_t> parse_factor(const std::string& smpi_coef_string);
-  XBT_PUBLIC void add_benched_time(double time);
-  XBT_PUBLIC void account_malloc_size(size_t size, const char* file, int line);
-  XBT_PUBLIC void account_shared_size(size_t size);
-  XBT_PUBLIC void print_time_analysis(double time);
-  XBT_PUBLIC void print_memory_analysis();
-  XBT_PUBLIC void print_current_handle();
-  static void set_current_handle(F2C* handle){current_handle=handle;}
-
-}
-}
-}
 
+namespace simgrid::smpi::utils {
+
+XBT_PUBLIC void add_benched_time(double time);
+XBT_PUBLIC void account_malloc_size(size_t size, std::string_view file, int line, const void* ptr);
+XBT_PUBLIC void account_shared_size(size_t size);
+XBT_PUBLIC void print_time_analysis(double time);
+XBT_PUBLIC void print_buffer_info();
+XBT_PUBLIC void print_memory_analysis();
+XBT_PUBLIC void print_current_handle();
+XBT_PUBLIC void set_current_handle(F2C* handle);
+XBT_PUBLIC void set_current_buffer(int i, const char* name, const void* handle);
+XBT_PUBLIC size_t get_buffer_size(const void* ptr);
+XBT_PUBLIC void account_free(const void* ptr);
+XBT_PUBLIC int check_collectives_ordering(MPI_Comm comm, const std::string& call);
+
+} // namespace simgrid::smpi::utils
 #endif