X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b214e9de5705ca77332bab116b2f23dba415f50..2818cfc3410f2a4b4aebc56514c823f2b4b5e856:/src/smpi/include/private.hpp diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index b74967f124..d650bf8700 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -6,29 +6,27 @@ #ifndef SMPI_PRIVATE_HPP #define SMPI_PRIVATE_HPP -#include "include/xbt/config.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 -extern "C" { - -#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 @@ -61,13 +59,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 char* instance_id, int rank, simgrid::s4u::ActorPtr actor); -XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const char* instance_id); -XBT_PRIVATE msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id); +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 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); @@ -86,14 +85,14 @@ 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(int dest); -XBT_PRIVATE void smpi_really_switch_data_segment(int dest); +XBT_PRIVATE void smpi_switch_data_segment(simgrid::s4u::ActorPtr actor); +XBT_PRIVATE void smpi_really_switch_data_segment(simgrid::s4u::ActorPtr actor); XBT_PRIVATE int smpi_is_privatization_file(char* file); -XBT_PRIVATE void smpi_get_executable_global_size(); +XBT_PRIVATE void smpi_prepare_global_memory_segment(); XBT_PRIVATE void smpi_backup_global_memory_segment(); XBT_PRIVATE void smpi_destroy_global_memory_segments(); XBT_PRIVATE void smpi_bench_destroy(); @@ -104,8 +103,11 @@ 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 + void mpi_init_(int* ierr); void mpi_finalize_(int* ierr); void mpi_abort_(int* comm, int* errorcode, int* ierr); @@ -402,8 +404,8 @@ 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); - -// TODO, make this static and expose it more cleanly +void smpi_init_fortran_types(); +} // extern "C" struct s_smpi_privatization_region_t { void* address; @@ -414,7 +416,6 @@ typedef s_smpi_privatization_region_t* smpi_privatization_region_t; extern XBT_PRIVATE int smpi_loaded_page; extern XBT_PRIVATE int smpi_universe_size; XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process(); -} /** * Get the address of the beginning of the memory page where addr is located. @@ -426,27 +427,20 @@ XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process( #if HAVE_PAPI typedef std::vector> papi_counter_t; -XBT_PRIVATE papi_counter_t& smpi_process_papi_counters(); -XBT_PRIVATE int smpi_process_papi_event_set(); +struct papi_process_data { + papi_counter_t counter_data; + int event_set; +}; +extern std::map units2papi_setup; #endif extern std::unordered_map location2speedup; -// TODO: Move this to the right location (if we keep this...) -void smpi_add_process(simgrid::s4u::ActorPtr actor); /** @brief Returns the last call location (filename, linenumber). Process-specific. */ -extern "C" { -XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location(); -XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location(); -} - -enum smpi_priv_strategies { - SMPI_PRIVATIZE_NONE = 0, - SMPI_PRIVATIZE_MMAP = 1, - SMPI_PRIVATIZE_DLOPEN = 2, - SMPI_PRIVATIZE_DEFAULT = SMPI_PRIVATIZE_DLOPEN -}; +XBT_PUBLIC smpi_trace_call_location_t* smpi_trace_get_call_location(); + +enum class SmpiPrivStrategies { NONE = 0, MMAP = 1, DLOPEN = 2, DEFAULT = DLOPEN }; -extern XBT_PRIVATE int smpi_privatize_global_variables; +extern XBT_PRIVATE SmpiPrivStrategies smpi_privatize_global_variables; #endif