smpi: initialize fields, and don't reset the actor each time we change the attached...

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

diff --git a/src/smpi/include/smpi_process.hpp b/src/smpi/include/smpi_process.hpp
index af8fa3d..68d717b 100644 (file)
--- a/src/smpi/include/smpi_process.hpp
+++ b/src/smpi/include/smpi_process.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2010, 2012-2017. The SimGrid Team.
+/* Copyright (c) 2009-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -28,14 +28,14 @@ class Process {
     MPI_Comm comm_intra_  = MPI_COMM_NULL;
     MPI_Comm* comm_world_ = nullptr;
     void* data_           = nullptr; /* user data */
-    char state_;
+    SmpiProcessState state_;
     int sampling_                   = 0; /* inside an SMPI_SAMPLE_ block? */
     std::string instance_id_;
     bool replaying_                 = false; /* is the process replaying a trace */
-    msg_bar_t finalization_barrier_;
+    simgrid::s4u::Barrier* finalization_barrier_;
     smpi_trace_call_location_t trace_call_loc_;
-    simgrid::s4u::ActorPtr process_ = nullptr;
-    smpi_privatization_region_t privatized_region_;
+    simgrid::s4u::ActorPtr actor_ = nullptr;
+    smpi_privatization_region_t privatized_region_ = nullptr;
     int optind=0; /*for getopt replacement */
 #if HAVE_PAPI
   /** Contains hardware data as read by PAPI **/
@@ -43,7 +43,7 @@ class Process {
     papi_counter_t papi_counter_data_;
 #endif
   public:
-    explicit Process(simgrid::s4u::ActorPtr actor, msg_bar_t barrier);
+    explicit Process(simgrid::s4u::ActorPtr actor, simgrid::s4u::Barrier* barrier);
     ~Process();
     void set_data(int* argc, char*** argv);
     void finalize();
@@ -73,9 +73,8 @@ class Process {
     void set_comm_intra(MPI_Comm comm);
     void set_sampling(int s);
     int sampling();
-    msg_bar_t finalization_barrier();
     static void init(int *argc, char ***argv);
-    simgrid::s4u::ActorPtr process();
+    simgrid::s4u::ActorPtr get_actor();
     int get_optind();
     void set_optind(int optind);
 };