X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d805d3e2b617db73c7c28cf4e4683cd9e6b928d4..cfa37467445963796bfdafdec9bad8ec8566a60a:/src/smpi/include/private.hpp diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index 42ad749470..8292cd7452 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -6,30 +6,26 @@ #ifndef SMPI_PRIVATE_HPP #define SMPI_PRIVATE_HPP -#include "simgrid/msg.h" // msg_bar_t +#include "simgrid/s4u/Barrier.hpp" #include "smpi/smpi.h" +#include "smpi/smpi_helpers_internal.h" #include "src/instr/instr_smpi.hpp" -#include "src/internal_config.h" #include #include -#include -#if _POSIX_TIMERS -#include -#endif -#define PERSISTENT 0x1 -#define NON_PERSISTENT 0x2 -#define SEND 0x4 -#define RECV 0x8 -#define RECV_DELETE 0x10 -#define ISEND 0x20 -#define SSEND 0x40 -#define PREPARED 0x80 -#define FINISHED 0x100 -#define RMA 0x200 -#define ACCUMULATE 0x400 +#define MPI_REQ_PERSISTENT 0x1 +#define MPI_REQ_NON_PERSISTENT 0x2 +#define MPI_REQ_SEND 0x4 +#define MPI_REQ_RECV 0x8 +//#define MPI_REQ_RECV_DELETE 0x10 +#define MPI_REQ_ISEND 0x20 +#define MPI_REQ_SSEND 0x40 +#define MPI_REQ_PREPARED 0x80 +#define MPI_REQ_FINISHED 0x100 +#define MPI_REQ_RMA 0x200 +#define MPI_REQ_ACCUMULATE 0x400 -enum smpi_process_state { SMPI_UNINITIALIZED, SMPI_INITIALIZED, SMPI_FINALIZED }; +enum class SmpiProcessState { UNINITIALIZED, INITIALIZING, INITIALIZED, FINALIZED }; #define COLL_TAG_REDUCE -112 #define COLL_TAG_SCATTER -223 @@ -62,14 +58,14 @@ typedef SMPI_Graph_topology* MPIR_Graph_Topology; typedef SMPI_Dist_Graph_topology* MPIR_Dist_Graph_Topology; -XBT_PRIVATE SMPI_Process* smpi_process(); -XBT_PRIVATE SMPI_Process* smpi_process_remote(simgrid::s4u::ActorPtr actor); +XBT_PRIVATE simgrid::smpi::ActorExt* smpi_process(); +XBT_PRIVATE simgrid::smpi::ActorExt* smpi_process_remote(simgrid::s4u::ActorPtr actor); XBT_PRIVATE int smpi_process_count(); XBT_PRIVATE void smpi_deployment_register_process(const std::string instance_id, int rank, simgrid::s4u::ActorPtr actor); XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const std::string instance_id); -XBT_PRIVATE msg_bar_t smpi_deployment_finalization_barrier(const std::string instance_id); +XBT_PRIVATE simgrid::s4u::Barrier* smpi_deployment_finalization_barrier(const std::string instance_id); XBT_PRIVATE void smpi_deployment_cleanup_instances(); XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_activity_t comm, void* buff, size_t buff_size); @@ -88,8 +84,8 @@ extern XBT_PRIVATE double smpi_host_speed; extern XBT_PRIVATE char* smpi_data_exe_start; // start of the data+bss segment of the executable extern XBT_PRIVATE int smpi_data_exe_size; // size of the data+bss segment of the executable -enum shared_malloc_type { shmalloc_none, shmalloc_local, shmalloc_global }; -extern XBT_PRIVATE shared_malloc_type smpi_cfg_shared_malloc; // Whether to activate shared malloc +enum class SharedMallocType { NONE, LOCAL, GLOBAL }; +extern XBT_PRIVATE SharedMallocType smpi_cfg_shared_malloc; // Whether to activate shared malloc XBT_PRIVATE void smpi_switch_data_segment(simgrid::s4u::ActorPtr actor); XBT_PRIVATE void smpi_really_switch_data_segment(simgrid::s4u::ActorPtr actor); @@ -106,7 +102,6 @@ XBT_PRIVATE void smpi_shared_destroy(); XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size); XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size); XBT_PRIVATE void smpi_free_tmp_buffer(void* buf); -XBT_PRIVATE void smpi_free_replay_tmp_buffers(); extern "C" { // f77 wrappers @@ -170,7 +165,7 @@ void mpi_test_(int* request, int* flag, MPI_Status* status, int* ierr); void mpi_testall_(int* count, int* requests, int* flag, MPI_Status* statuses, int* ierr); void mpi_get_count_(MPI_Status* status, int* datatype, int* count, int* ierr); void mpi_type_extent_(int* datatype, MPI_Aint* extent, int* ierr); -void mpi_attr_get_(int* comm, int* keyval, void* attr_value, int* flag, int* ierr); +void mpi_attr_get_(int* comm, int* keyval, int* attr_value, int* flag, int* ierr); void mpi_type_commit_(int* datatype, int* ierr); void mpi_type_vector_(int* count, int* blocklen, int* stride, int* old_type, int* newtype, int* ierr); void mpi_type_hvector_(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype, int* ierr); @@ -194,8 +189,8 @@ void mpi_win_detach_(int* win, int* base, int* ierr); void mpi_win_set_info_(int* win, int* info, int* ierr); void mpi_win_get_info_(int* win, int* info, int* ierr); void mpi_win_get_group_(int* win, int* group, int* ierr); -void mpi_win_get_attr_(int* win, int* type_keyval, void* attribute_val, int* flag, int* ierr); -void mpi_win_set_attr_(int* win, int* type_keyval, void* att, int* ierr); +void mpi_win_get_attr_(int* win, int* type_keyval, int* attribute_val, int* flag, int* ierr); +void mpi_win_set_attr_(int* win, int* type_keyval, int* att, int* ierr); void mpi_win_delete_attr_(int* win, int* comm_keyval, int* ierr); void mpi_win_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); void mpi_win_free_keyval_(int* keyval, int* ierr); @@ -246,8 +241,8 @@ void mpi_get_address_(void* location, MPI_Aint* address, int* ierr); void mpi_type_dup_(int* datatype, int* newdatatype, int* ierr); void mpi_type_set_name_(int* datatype, char* name, int* ierr, int size); void mpi_type_get_name_(int* datatype, char* name, int* len, int* ierr); -void mpi_type_get_attr_(int* type, int* type_keyval, void* attribute_val, int* flag, int* ierr); -void mpi_type_set_attr_(int* type, int* type_keyval, void* attribute_val, int* ierr); +void mpi_type_get_attr_(int* type, int* type_keyval, int* attribute_val, int* flag, int* ierr); +void mpi_type_set_attr_(int* type, int* type_keyval, int* attribute_val, int* ierr); void mpi_type_delete_attr_(int* type, int* type_keyval, int* ierr); void mpi_type_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); void mpi_type_free_keyval_(int* keyval, int* ierr); @@ -268,8 +263,8 @@ void mpi_group_difference_(int* group1, int* group2, int* newgroup, int* ierr); void mpi_group_excl_(int* group, int* n, int* ranks, int* newgroup, int* ierr); void mpi_group_range_incl_(int* group, int* n, int ranges[][3], int* newgroup, int* ierr); void mpi_group_range_excl_(int* group, int* n, int ranges[][3], int* newgroup, int* ierr); -void mpi_comm_get_attr_(int* comm, int* comm_keyval, void* attribute_val, int* flag, int* ierr); -void mpi_comm_set_attr_(int* comm, int* comm_keyval, void* attribute_val, int* ierr); +void mpi_comm_get_attr_(int* comm, int* comm_keyval, int* attribute_val, int* flag, int* ierr); +void mpi_comm_set_attr_(int* comm, int* comm_keyval, int* attribute_val, int* ierr); void mpi_comm_delete_attr_(int* comm, int* comm_keyval, int* ierr); void mpi_comm_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); void mpi_comm_free_keyval_(int* keyval, int* ierr); @@ -341,7 +336,7 @@ void mpi_comm_remote_size_(int* comm, int* size, int* ierr); void mpi_issend_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr); void mpi_probe_(int* source, int* tag, int* comm, MPI_Status* status, int* ierr); void mpi_attr_delete_(int* comm, int* keyval, int* ierr); -void mpi_attr_put_(int* comm, int* keyval, void* attr_value, int* ierr); +void mpi_attr_put_(int* comm, int* keyval, int* attr_value, int* ierr); void mpi_rsend_init_(void* buf, int* count, int* datatype, int* dest, int* tag, int* comm, int* request, int* ierr); void mpi_keyval_create_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr); void mpi_keyval_free_(int* keyval, int* ierr); @@ -407,21 +402,7 @@ void mpi_file_open_(int* comm, char* filename, int* amode, int* info, int* fh, i void mpi_file_set_view_(int* fh, long long int* offset, int* etype, int* filetype, char* datarep, int* info, int* ierr); void mpi_file_read_(int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr); void mpi_file_write_(int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr); - - -XBT_PUBLIC int smpi_usleep(useconds_t usecs); -#if _POSIX_TIMERS > 0 -XBT_PUBLIC int smpi_nanosleep(const struct timespec* tp, struct timespec* t); -XBT_PUBLIC int smpi_clock_gettime(clockid_t clk_id, struct timespec* tp); -#endif -XBT_PUBLIC unsigned int smpi_sleep(unsigned int secs); -XBT_PUBLIC int smpi_gettimeofday(struct timeval* tv, struct timezone* tz); - - -struct option; -XBT_PUBLIC int smpi_getopt_long (int argc, char *const *argv, const char *options, const struct option *long_options, int *opt_index); -XBT_PUBLIC int smpi_getopt (int argc, char *const *argv, const char *options); - +void smpi_init_fortran_types(); } // extern "C" struct s_smpi_privatization_region_t { @@ -442,16 +423,20 @@ XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process( */ #define TOPAGE(addr) (void*)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize) -#if HAVE_PAPI +/** Used only if PAPI is compiled in, but integrated anyway so that this file does not depend on internal_config.h (to speed builds) */ typedef std::vector> papi_counter_t; -#endif +struct papi_process_data { + papi_counter_t counter_data; + int event_set; +}; +extern std::map units2papi_setup; extern std::unordered_map location2speedup; /** @brief Returns the last call location (filename, linenumber). Process-specific. */ XBT_PUBLIC smpi_trace_call_location_t* smpi_trace_get_call_location(); -enum class SmpiPrivStrategies { None = 0, Mmap = 1, Dlopen = 2, Default = Dlopen }; +enum class SmpiPrivStrategies { NONE = 0, MMAP = 1, DLOPEN = 2, DEFAULT = DLOPEN }; extern XBT_PRIVATE SmpiPrivStrategies smpi_privatize_global_variables;