Merge branch 'toufic' of github.com:Takishipp/simgrid

[simgrid.git] / src / smpi / smpi_process.hpp

diff --git a/src/smpi/smpi_process.hpp b/src/smpi/smpi_process.hpp
index e87f741..9cc8a2a 100644 (file)
--- a/src/smpi/smpi_process.hpp
+++ b/src/smpi/smpi_process.hpp
@@ -28,14 +28,13 @@ class Process {
     MPI_Comm comm_self_   = MPI_COMM_NULL;
     MPI_Comm comm_intra_  = MPI_COMM_NULL;
     MPI_Comm* comm_world_ = nullptr;
-    void* data_           = nullptr; /* user data */
     int index_            = MPI_UNDEFINED;
     char state_;
     int sampling_                   = 0; /* inside an SMPI_SAMPLE_ block? */
     char* instance_id_              = nullptr;
     bool replaying_                 = false; /* is the process replaying a trace */
-    msg_bar_t finalization_barrier_ = nullptr;
-    int return_value_               = 0;
+    msg_bar_t finalization_barrier_;
+    int return_value_ = 0;
     smpi_trace_call_location_t trace_call_loc_;
     smx_actor_t process_ = nullptr;
 #if HAVE_PAPI
@@ -44,17 +43,14 @@ class Process {
     papi_counter_t papi_counter_data_;
 #endif
   public:
-    explicit Process(int index);
-    void destroy();
-    void set_data(int* argc, char*** argv);
+    explicit Process(int index, msg_bar_t barrier);
+    void set_data(int index, int* argc, char*** argv);
     void finalize();
     int finalized();
     int initialized();
     void mark_as_initialized();
     void set_replaying(bool value);
     bool replaying();
-    void set_user_data(void *data);
-    void *get_user_data();
     smpi_trace_call_location_t* call_location();
     int index();
     MPI_Comm comm_world();
@@ -74,7 +70,6 @@ class Process {
     void set_sampling(int s);
     int sampling();
     msg_bar_t finalization_barrier();
-    void set_finalization_barrier(msg_bar_t bar);
     int return_value();
     void set_return_value(int val);
     static void init(int *argc, char ***argv);