X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..74136bc9be5242a580fe6b291076c68569678d7e:/src/smpi/include/smpi_process.hpp diff --git a/src/smpi/include/smpi_process.hpp b/src/smpi/include/smpi_process.hpp index 04bb58186f..f6bfa80176 100644 --- a/src/smpi/include/smpi_process.hpp +++ b/src/smpi/include/smpi_process.hpp @@ -7,8 +7,9 @@ #ifndef SMPI_PROCESS_HPP #define SMPI_PROCESS_HPP -#include "src/instr/instr_smpi.hpp" +#include "private.hpp" #include "simgrid/s4u/Mailbox.hpp" +#include "src/instr/instr_smpi.hpp" #include "xbt/synchro.h" namespace simgrid{ @@ -35,14 +36,15 @@ class Process { msg_bar_t finalization_barrier_; int return_value_ = 0; smpi_trace_call_location_t trace_call_loc_; - smx_actor_t process_ = nullptr; + simgrid::s4u::ActorPtr process_ = nullptr; + smpi_privatization_region_t privatized_region_; #if HAVE_PAPI /** Contains hardware data as read by PAPI **/ int papi_event_set_; papi_counter_t papi_counter_data_; #endif public: - explicit Process(int index, msg_bar_t barrier); + explicit Process(simgrid::s4u::ActorPtr actor, msg_bar_t barrier); void set_data(int index, int* argc, char*** argv); void finalize(); int finalized(); @@ -53,8 +55,9 @@ class Process { void set_user_data(void *data); void *get_user_data(); smpi_trace_call_location_t* call_location(); + void set_privatized_region(smpi_privatization_region_t region); + smpi_privatization_region_t privatized_region(); int index(); - MPI_Comm comm_world(); smx_mailbox_t mailbox(); smx_mailbox_t mailbox_small(); xbt_mutex_t mailboxes_mutex(); @@ -65,6 +68,7 @@ class Process { xbt_os_timer_t timer(); void simulated_start(); double simulated_elapsed(); + MPI_Comm comm_world(); MPI_Comm comm_self(); MPI_Comm comm_intra(); void set_comm_intra(MPI_Comm comm); @@ -74,7 +78,7 @@ class Process { int return_value(); void set_return_value(int val); static void init(int *argc, char ***argv); - smx_actor_t process(); + simgrid::s4u::ActorPtr process(); };