From: Gabriel Corona Date: Tue, 29 Sep 2015 12:41:57 +0000 (+0200) Subject: Mark some internal symbols as hidden on ELF in smpi X-Git-Tag: v3_12~79^2~10 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9afdb8b9406f641c886d87ed1e339ec841212215 Mark some internal symbols as hidden on ELF in smpi --- diff --git a/src/smpi/private.h b/src/smpi/private.h index 00c8ed89a0..ce49def1cb 100644 --- a/src/smpi/private.h +++ b/src/smpi/private.h @@ -9,6 +9,7 @@ #include "internal_config.h" #include "xbt.h" +#include "xbt/base.h" #include "xbt/xbt_os_time.h" #include "xbt/synchro_core.h" #include "simgrid/simix.h" @@ -130,11 +131,11 @@ typedef struct s_smpi_mpi_info { } s_smpi_mpi_info_t; -void smpi_process_destroy(void); -void smpi_process_finalize(void); -int smpi_process_finalized(void); -int smpi_process_initialized(void); -void smpi_process_mark_as_initialized(void); +XBT_PRIVATE void smpi_process_destroy(void); +XBT_PRIVATE void smpi_process_finalize(void); +XBT_PRIVATE int smpi_process_finalized(void); +XBT_PRIVATE int smpi_process_initialized(void); +XBT_PRIVATE void smpi_process_mark_as_initialized(void); struct s_smpi_mpi_cart_topology; @@ -148,327 +149,327 @@ typedef struct s_smpi_dist_graph_topology *MPIR_Dist_Graph_Topology; // MPI_Topology defined in smpi.h, as it is public -void smpi_topo_destroy(MPI_Topology topo); -MPI_Topology smpi_topo_create(MPIR_Topo_type kind); -void smpi_cart_topo_destroy(MPIR_Cart_Topology cart); -MPI_Topology smpi_cart_topo_create(int ndims); -int smpi_mpi_cart_create(MPI_Comm comm_old, int ndims, int dims[], +XBT_PRIVATE void smpi_topo_destroy(MPI_Topology topo); +XBT_PRIVATE MPI_Topology smpi_topo_create(MPIR_Topo_type kind); +XBT_PRIVATE void smpi_cart_topo_destroy(MPIR_Cart_Topology cart); +XBT_PRIVATE MPI_Topology smpi_cart_topo_create(int ndims); +XBT_PRIVATE int smpi_mpi_cart_create(MPI_Comm comm_old, int ndims, int dims[], int periods[], int reorder, MPI_Comm *comm_cart); -int smpi_mpi_cart_sub(MPI_Comm comm, const int remain_dims[], MPI_Comm *newcomm); -int smpi_mpi_cart_coords(MPI_Comm comm, int rank, int maxdims, +XBT_PRIVATE int smpi_mpi_cart_sub(MPI_Comm comm, const int remain_dims[], MPI_Comm *newcomm); +XBT_PRIVATE int smpi_mpi_cart_coords(MPI_Comm comm, int rank, int maxdims, int coords[]); -int smpi_mpi_cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, +XBT_PRIVATE int smpi_mpi_cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coords); -int smpi_mpi_cart_rank(MPI_Comm comm, int* coords, int* rank); -int smpi_mpi_cart_shift(MPI_Comm comm, int direction, int disp, +XBT_PRIVATE int smpi_mpi_cart_rank(MPI_Comm comm, int* coords, int* rank); +XBT_PRIVATE int smpi_mpi_cart_shift(MPI_Comm comm, int direction, int disp, int *rank_source, int *rank_dest); -int smpi_mpi_cartdim_get(MPI_Comm comm, int *ndims); -int smpi_mpi_dims_create(int nnodes, int ndims, int dims[]); - - -smpi_process_data_t smpi_process_data(void); -smpi_process_data_t smpi_process_remote_data(int index); -void smpi_process_set_user_data(void *); -void* smpi_process_get_user_data(void); -int smpi_process_count(void); -MPI_Comm smpi_process_comm_world(void); -MPI_Comm smpi_process_get_comm_intra(void); -void smpi_process_set_comm_intra(MPI_Comm comm); -smx_rdv_t smpi_process_mailbox(void); -smx_rdv_t smpi_process_remote_mailbox(int index); -smx_rdv_t smpi_process_mailbox_small(void); -smx_rdv_t smpi_process_remote_mailbox_small(int index); -xbt_mutex_t smpi_process_mailboxes_mutex(void); -xbt_mutex_t smpi_process_remote_mailboxes_mutex(int index); -xbt_os_timer_t smpi_process_timer(void); -void smpi_process_simulated_start(void); -double smpi_process_simulated_elapsed(void); -void smpi_process_set_sampling(int s); -int smpi_process_get_sampling(void); -void smpi_process_set_replaying(int s); -int smpi_process_get_replaying(void); - -void smpi_deployment_register_process(const char* instance_id, int rank, int index, MPI_Comm**, xbt_bar_t*); -void smpi_deployment_cleanup_instances(void); - -void smpi_comm_copy_buffer_callback(smx_synchro_t comm, +XBT_PRIVATE int smpi_mpi_cartdim_get(MPI_Comm comm, int *ndims); +XBT_PRIVATE int smpi_mpi_dims_create(int nnodes, int ndims, int dims[]); + + +XBT_PRIVATE smpi_process_data_t smpi_process_data(void); +XBT_PRIVATE smpi_process_data_t smpi_process_remote_data(int index); +XBT_PRIVATE void smpi_process_set_user_data(void *); +XBT_PRIVATE void* smpi_process_get_user_data(void); +XBT_PRIVATE int smpi_process_count(void); +XBT_PRIVATE MPI_Comm smpi_process_comm_world(void); +XBT_PRIVATE MPI_Comm smpi_process_get_comm_intra(void); +XBT_PRIVATE void smpi_process_set_comm_intra(MPI_Comm comm); +XBT_PRIVATE smx_rdv_t smpi_process_mailbox(void); +XBT_PRIVATE smx_rdv_t smpi_process_remote_mailbox(int index); +XBT_PRIVATE smx_rdv_t smpi_process_mailbox_small(void); +XBT_PRIVATE smx_rdv_t smpi_process_remote_mailbox_small(int index); +XBT_PRIVATE xbt_mutex_t smpi_process_mailboxes_mutex(void); +XBT_PRIVATE xbt_mutex_t smpi_process_remote_mailboxes_mutex(int index); +XBT_PRIVATE xbt_os_timer_t smpi_process_timer(void); +XBT_PRIVATE void smpi_process_simulated_start(void); +XBT_PRIVATE double smpi_process_simulated_elapsed(void); +XBT_PRIVATE void smpi_process_set_sampling(int s); +XBT_PRIVATE int smpi_process_get_sampling(void); +XBT_PRIVATE void smpi_process_set_replaying(int s); +XBT_PRIVATE int smpi_process_get_replaying(void); + +XBT_PRIVATE void smpi_deployment_register_process(const char* instance_id, int rank, int index, MPI_Comm**, xbt_bar_t*); +XBT_PRIVATE void smpi_deployment_cleanup_instances(void); + +XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_synchro_t comm, void *buff, size_t buff_size); -void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm, +XBT_PRIVATE void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm, void *buff, size_t buff_size); -void print_request(const char *message, MPI_Request request); +XBT_PRIVATE void print_request(const char *message, MPI_Request request); -int smpi_enabled(void); -void smpi_global_init(void); -void smpi_global_destroy(void); -double smpi_mpi_wtime(void); +XBT_PRIVATE int smpi_enabled(void); +XBT_PRIVATE void smpi_global_init(void); +XBT_PRIVATE void smpi_global_destroy(void); +XBT_PRIVATE double smpi_mpi_wtime(void); -int is_datatype_valid(MPI_Datatype datatype); +XBT_PRIVATE int is_datatype_valid(MPI_Datatype datatype); -size_t smpi_datatype_size(MPI_Datatype datatype); -MPI_Aint smpi_datatype_lb(MPI_Datatype datatype); -MPI_Aint smpi_datatype_ub(MPI_Datatype datatype); -int smpi_datatype_dup(MPI_Datatype datatype, MPI_Datatype* new_t); -int smpi_datatype_extent(MPI_Datatype datatype, MPI_Aint * lb, +XBT_PRIVATE size_t smpi_datatype_size(MPI_Datatype datatype); +XBT_PRIVATE MPI_Aint smpi_datatype_lb(MPI_Datatype datatype); +XBT_PRIVATE MPI_Aint smpi_datatype_ub(MPI_Datatype datatype); +XBT_PRIVATE int smpi_datatype_dup(MPI_Datatype datatype, MPI_Datatype* new_t); +XBT_PRIVATE int smpi_datatype_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent); -MPI_Aint smpi_datatype_get_extent(MPI_Datatype datatype); -void smpi_datatype_get_name(MPI_Datatype datatype, char* name, int* length); -void smpi_datatype_set_name(MPI_Datatype datatype, char* name); -int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype, +XBT_PRIVATE MPI_Aint smpi_datatype_get_extent(MPI_Datatype datatype); +XBT_PRIVATE void smpi_datatype_get_name(MPI_Datatype datatype, char* name, int* length); +XBT_PRIVATE void smpi_datatype_set_name(MPI_Datatype datatype, char* name); +XBT_PRIVATE int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype); -void smpi_datatype_use(MPI_Datatype type); -void smpi_datatype_unuse(MPI_Datatype type); +XBT_PRIVATE void smpi_datatype_use(MPI_Datatype type); +XBT_PRIVATE void smpi_datatype_unuse(MPI_Datatype type); -int smpi_datatype_contiguous(int count, MPI_Datatype old_type, +XBT_PRIVATE int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type, MPI_Aint lb); -int smpi_datatype_vector(int count, int blocklen, int stride, +XBT_PRIVATE int smpi_datatype_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type); -int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, +XBT_PRIVATE int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type); -int smpi_datatype_indexed(int count, int* blocklens, int* indices, +XBT_PRIVATE int smpi_datatype_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type); -int smpi_datatype_hindexed(int count, int* blocklens, MPI_Aint* indices, +XBT_PRIVATE int smpi_datatype_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type); -int smpi_datatype_struct(int count, int* blocklens, MPI_Aint* indices, +XBT_PRIVATE int smpi_datatype_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* new_type); -void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int has_subtype, void *struct_type, int flags); +XBT_PRIVATE void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int has_subtype, void *struct_type, int flags); -void smpi_datatype_free(MPI_Datatype* type); -void smpi_datatype_commit(MPI_Datatype* datatype); +XBT_PRIVATE void smpi_datatype_free(MPI_Datatype* type); +XBT_PRIVATE void smpi_datatype_commit(MPI_Datatype* datatype); -int smpi_mpi_unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm); -int smpi_mpi_pack(void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm); +XBT_PRIVATE int smpi_mpi_unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm); +XBT_PRIVATE int smpi_mpi_pack(void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm); -void smpi_empty_status(MPI_Status * status); -MPI_Op smpi_op_new(MPI_User_function * function, int commute); -int smpi_op_is_commute(MPI_Op op); -void smpi_op_destroy(MPI_Op op); -void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len, +XBT_PRIVATE void smpi_empty_status(MPI_Status * status); +XBT_PRIVATE MPI_Op smpi_op_new(MPI_User_function * function, int commute); +XBT_PRIVATE int smpi_op_is_commute(MPI_Op op); +XBT_PRIVATE void smpi_op_destroy(MPI_Op op); +XBT_PRIVATE void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len, MPI_Datatype * datatype); -MPI_Group smpi_group_new(int size); -MPI_Group smpi_group_copy(MPI_Group origin); -void smpi_group_destroy(MPI_Group group); -void smpi_group_set_mapping(MPI_Group group, int index, int rank); -int smpi_group_index(MPI_Group group, int rank); -int smpi_group_rank(MPI_Group group, int index); -int smpi_group_use(MPI_Group group); -int smpi_group_unuse(MPI_Group group); -int smpi_group_size(MPI_Group group); -int smpi_group_compare(MPI_Group group1, MPI_Group group2); -int smpi_group_incl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup); - - -MPI_Topology smpi_comm_topo(MPI_Comm comm); -MPI_Comm smpi_comm_new(MPI_Group group, MPI_Topology topo); -void smpi_comm_destroy(MPI_Comm comm); -MPI_Group smpi_comm_group(MPI_Comm comm); -int smpi_comm_size(MPI_Comm comm); -void smpi_comm_get_name(MPI_Comm comm, char* name, int* len); -int smpi_comm_rank(MPI_Comm comm); -MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key); -int smpi_comm_dup(MPI_Comm comm, MPI_Comm* newcomm); -void smpi_comm_use(MPI_Comm comm); -void smpi_comm_unuse(MPI_Comm comm); -void smpi_comm_set_leaders_comm(MPI_Comm comm, MPI_Comm leaders); -void smpi_comm_set_intra_comm(MPI_Comm comm, MPI_Comm leaders); -int* smpi_comm_get_non_uniform_map(MPI_Comm comm); -int* smpi_comm_get_leaders_map(MPI_Comm comm); -MPI_Comm smpi_comm_get_leaders_comm(MPI_Comm comm); -MPI_Comm smpi_comm_get_intra_comm(MPI_Comm comm); -int smpi_comm_is_uniform(MPI_Comm comm); -int smpi_comm_is_blocked(MPI_Comm comm); -void smpi_comm_init_smp(MPI_Comm comm); - -int smpi_comm_c2f(MPI_Comm comm); -MPI_Comm smpi_comm_f2c(int comm); -int smpi_group_c2f(MPI_Group group); -MPI_Group smpi_group_f2c(int group); -int smpi_request_c2f(MPI_Request req); -MPI_Request smpi_request_f2c(int req); -int smpi_type_c2f(MPI_Datatype datatype); -MPI_Datatype smpi_type_f2c(int datatype); -int smpi_op_c2f(MPI_Op op); -MPI_Op smpi_op_f2c(int op); -int smpi_win_c2f(MPI_Win win); -MPI_Win smpi_win_f2c(int win); -int smpi_info_c2f(MPI_Info info); -MPI_Info smpi_info_f2c(int info); - -MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Group smpi_group_new(int size); +XBT_PRIVATE MPI_Group smpi_group_copy(MPI_Group origin); +XBT_PRIVATE void smpi_group_destroy(MPI_Group group); +XBT_PRIVATE void smpi_group_set_mapping(MPI_Group group, int index, int rank); +XBT_PRIVATE int smpi_group_index(MPI_Group group, int rank); +XBT_PRIVATE int smpi_group_rank(MPI_Group group, int index); +XBT_PRIVATE int smpi_group_use(MPI_Group group); +XBT_PRIVATE int smpi_group_unuse(MPI_Group group); +XBT_PRIVATE int smpi_group_size(MPI_Group group); +XBT_PRIVATE int smpi_group_compare(MPI_Group group1, MPI_Group group2); +XBT_PRIVATE int smpi_group_incl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup); + + +XBT_PRIVATE MPI_Topology smpi_comm_topo(MPI_Comm comm); +XBT_PRIVATE MPI_Comm smpi_comm_new(MPI_Group group, MPI_Topology topo); +XBT_PRIVATE void smpi_comm_destroy(MPI_Comm comm); +XBT_PRIVATE MPI_Group smpi_comm_group(MPI_Comm comm); +XBT_PRIVATE int smpi_comm_size(MPI_Comm comm); +XBT_PRIVATE void smpi_comm_get_name(MPI_Comm comm, char* name, int* len); +XBT_PRIVATE int smpi_comm_rank(MPI_Comm comm); +XBT_PRIVATE MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key); +XBT_PRIVATE int smpi_comm_dup(MPI_Comm comm, MPI_Comm* newcomm); +XBT_PRIVATE void smpi_comm_use(MPI_Comm comm); +XBT_PRIVATE void smpi_comm_unuse(MPI_Comm comm); +XBT_PRIVATE void smpi_comm_set_leaders_comm(MPI_Comm comm, MPI_Comm leaders); +XBT_PRIVATE void smpi_comm_set_intra_comm(MPI_Comm comm, MPI_Comm leaders); +XBT_PRIVATE int* smpi_comm_get_non_uniform_map(MPI_Comm comm); +XBT_PRIVATE int* smpi_comm_get_leaders_map(MPI_Comm comm); +XBT_PRIVATE MPI_Comm smpi_comm_get_leaders_comm(MPI_Comm comm); +XBT_PRIVATE MPI_Comm smpi_comm_get_intra_comm(MPI_Comm comm); +XBT_PRIVATE int smpi_comm_is_uniform(MPI_Comm comm); +XBT_PRIVATE int smpi_comm_is_blocked(MPI_Comm comm); +XBT_PRIVATE void smpi_comm_init_smp(MPI_Comm comm); + +XBT_PRIVATE int smpi_comm_c2f(MPI_Comm comm); +XBT_PRIVATE MPI_Comm smpi_comm_f2c(int comm); +XBT_PRIVATE int smpi_group_c2f(MPI_Group group); +XBT_PRIVATE MPI_Group smpi_group_f2c(int group); +XBT_PRIVATE int smpi_request_c2f(MPI_Request req); +XBT_PRIVATE MPI_Request smpi_request_f2c(int req); +XBT_PRIVATE int smpi_type_c2f(MPI_Datatype datatype); +XBT_PRIVATE MPI_Datatype smpi_type_f2c(int datatype); +XBT_PRIVATE int smpi_op_c2f(MPI_Op op); +XBT_PRIVATE MPI_Op smpi_op_f2c(int op); +XBT_PRIVATE int smpi_win_c2f(MPI_Win win); +XBT_PRIVATE MPI_Win smpi_win_f2c(int win); +XBT_PRIVATE int smpi_info_c2f(MPI_Info info); +XBT_PRIVATE MPI_Info smpi_info_f2c(int info); + +XBT_PRIVATE MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); -MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm); -MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); -void smpi_mpi_start(MPI_Request request); -void smpi_mpi_startall(int count, MPI_Request * requests); -void smpi_mpi_request_free(MPI_Request * request); -MPI_Request smpi_isend_init(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE void smpi_mpi_start(MPI_Request request); +XBT_PRIVATE void smpi_mpi_startall(int count, MPI_Request * requests); +XBT_PRIVATE void smpi_mpi_request_free(MPI_Request * request); +XBT_PRIVATE MPI_Request smpi_isend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); -MPI_Request smpi_mpi_isend(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_mpi_isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); -MPI_Request smpi_issend_init(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_issend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); -MPI_Request smpi_mpi_issend(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_mpi_issend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); -MPI_Request smpi_irecv_init(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_irecv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm); -MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm); -MPI_Request smpi_rma_send_init(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_rma_send_init(void *buf, int count, MPI_Datatype datatype, int src, int dst, int tag, MPI_Comm comm, MPI_Op op); -MPI_Request smpi_rma_recv_init(void *buf, int count, MPI_Datatype datatype, +XBT_PRIVATE MPI_Request smpi_rma_recv_init(void *buf, int count, MPI_Datatype datatype, int src, int dst, int tag, MPI_Comm comm, MPI_Op op); -void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src, +XBT_PRIVATE void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status * status); -void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, +XBT_PRIVATE void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); -void smpi_mpi_ssend(void *buf, int count, MPI_Datatype datatype, int dst, +XBT_PRIVATE void smpi_mpi_ssend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm); -void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, +XBT_PRIVATE void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void *recvbuf, int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status * status); -int smpi_mpi_test(MPI_Request * request, MPI_Status * status); -int smpi_mpi_testany(int count, MPI_Request requests[], int *index, +XBT_PRIVATE int smpi_mpi_test(MPI_Request * request, MPI_Status * status); +XBT_PRIVATE int smpi_mpi_testany(int count, MPI_Request requests[], int *index, MPI_Status * status); -int smpi_mpi_testall(int count, MPI_Request requests[], +XBT_PRIVATE int smpi_mpi_testall(int count, MPI_Request requests[], MPI_Status status[]); -void smpi_mpi_probe(int source, int tag, MPI_Comm comm, MPI_Status* status); -void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, +XBT_PRIVATE void smpi_mpi_probe(int source, int tag, MPI_Comm comm, MPI_Status* status); +XBT_PRIVATE void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status); -int smpi_mpi_get_count(MPI_Status * status, MPI_Datatype datatype); -void smpi_mpi_wait(MPI_Request * request, MPI_Status * status); -int smpi_mpi_waitany(int count, MPI_Request requests[], +XBT_PRIVATE int smpi_mpi_get_count(MPI_Status * status, MPI_Datatype datatype); +XBT_PRIVATE void smpi_mpi_wait(MPI_Request * request, MPI_Status * status); +XBT_PRIVATE int smpi_mpi_waitany(int count, MPI_Request requests[], MPI_Status * status); -int smpi_mpi_waitall(int count, MPI_Request requests[], +XBT_PRIVATE int smpi_mpi_waitall(int count, MPI_Request requests[], MPI_Status status[]); -int smpi_mpi_waitsome(int incount, MPI_Request requests[], int *indices, +XBT_PRIVATE int smpi_mpi_waitsome(int incount, MPI_Request requests[], int *indices, MPI_Status status[]); -int smpi_mpi_testsome(int incount, MPI_Request requests[], int *indices, +XBT_PRIVATE int smpi_mpi_testsome(int incount, MPI_Request requests[], int *indices, MPI_Status status[]); -void smpi_mpi_bcast(void *buf, int count, MPI_Datatype datatype, int root, +XBT_PRIVATE void smpi_mpi_bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm); -void smpi_mpi_barrier(MPI_Comm comm); -void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, +XBT_PRIVATE void smpi_mpi_barrier(MPI_Comm comm); +XBT_PRIVATE void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm); -void smpi_mpi_reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, +XBT_PRIVATE void smpi_mpi_reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); -void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, +XBT_PRIVATE void smpi_mpi_gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm); -void smpi_mpi_allgather(void *sendbuf, int sendcount, +XBT_PRIVATE void smpi_mpi_allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm); -void smpi_mpi_allgatherv(void *sendbuf, int sendcount, +XBT_PRIVATE void smpi_mpi_allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, MPI_Comm comm); -void smpi_mpi_scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, +XBT_PRIVATE void smpi_mpi_scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm); -void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs, +XBT_PRIVATE void smpi_mpi_scatterv(void *sendbuf, int *sendcounts, int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm); -void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, +XBT_PRIVATE void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm); -void smpi_mpi_allreduce(void *sendbuf, void *recvbuf, int count, +XBT_PRIVATE void smpi_mpi_allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); -void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count, +XBT_PRIVATE void smpi_mpi_scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); -void smpi_mpi_exscan(void *sendbuf, void *recvbuf, int count, +XBT_PRIVATE void smpi_mpi_exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); -int smpi_mpi_win_free( MPI_Win* win); +XBT_PRIVATE int smpi_mpi_win_free( MPI_Win* win); -MPI_Win smpi_mpi_win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm); +XBT_PRIVATE MPI_Win smpi_mpi_win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm); -void smpi_mpi_win_get_name(MPI_Win win, char* name, int* length); -void smpi_mpi_win_get_group(MPI_Win win, MPI_Group* group); -void smpi_mpi_win_set_name(MPI_Win win, char* name); +XBT_PRIVATE void smpi_mpi_win_get_name(MPI_Win win, char* name, int* length); +XBT_PRIVATE void smpi_mpi_win_get_group(MPI_Win win, MPI_Group* group); +XBT_PRIVATE void smpi_mpi_win_set_name(MPI_Win win, char* name); -int smpi_mpi_win_fence( int assert, MPI_Win win); +XBT_PRIVATE int smpi_mpi_win_fence( int assert, MPI_Win win); -int smpi_mpi_win_post(MPI_Group group, int assert, MPI_Win win); -int smpi_mpi_win_start(MPI_Group group, int assert, MPI_Win win); -int smpi_mpi_win_complete(MPI_Win win); -int smpi_mpi_win_wait(MPI_Win win); +XBT_PRIVATE int smpi_mpi_win_post(MPI_Group group, int assert, MPI_Win win); +XBT_PRIVATE int smpi_mpi_win_start(MPI_Group group, int assert, MPI_Win win); +XBT_PRIVATE int smpi_mpi_win_complete(MPI_Win win); +XBT_PRIVATE int smpi_mpi_win_wait(MPI_Win win); -int smpi_mpi_get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, +XBT_PRIVATE int smpi_mpi_get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win); -int smpi_mpi_put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, +XBT_PRIVATE int smpi_mpi_put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win); -int smpi_mpi_accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, +XBT_PRIVATE int smpi_mpi_accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win); -void nary_tree_bcast(void *buf, int count, MPI_Datatype datatype, int root, +XBT_PRIVATE void nary_tree_bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, int arity); -void nary_tree_barrier(MPI_Comm comm, int arity); +XBT_PRIVATE void nary_tree_barrier(MPI_Comm comm, int arity); -int smpi_coll_tuned_alltoall_ompi2(void *sendbuf, int sendcount, +XBT_PRIVATE int smpi_coll_tuned_alltoall_ompi2(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm); -int smpi_coll_tuned_alltoall_bruck(void *sendbuf, int sendcount, +XBT_PRIVATE int smpi_coll_tuned_alltoall_bruck(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm); -int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount, +XBT_PRIVATE int smpi_coll_tuned_alltoall_basic_linear(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm); -int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts, +XBT_PRIVATE int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts, int *senddisps, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *recvdisps, MPI_Datatype recvtype, MPI_Comm comm); -int smpi_comm_keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state); -int smpi_comm_keyval_free(int* keyval); -int smpi_comm_attr_delete(MPI_Comm comm, int keyval); -int smpi_comm_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag); -int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value); -int smpi_type_attr_delete(MPI_Datatype type, int keyval); -int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag); -int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value); -int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state); -int smpi_type_keyval_free(int* keyval); +XBT_PRIVATE int smpi_comm_keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state); +XBT_PRIVATE int smpi_comm_keyval_free(int* keyval); +XBT_PRIVATE int smpi_comm_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag); +XBT_PRIVATE int smpi_comm_attr_delete(MPI_Comm comm, int keyval); +XBT_PRIVATE int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value); +XBT_PRIVATE int smpi_type_attr_delete(MPI_Datatype type, int keyval); +XBT_PRIVATE int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag); +XBT_PRIVATE int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value); +XBT_PRIVATE int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state); +XBT_PRIVATE int smpi_type_keyval_free(int* keyval); // utilities -extern double smpi_cpu_threshold; -extern double smpi_running_power; -extern int smpi_privatize_global_variables; -extern char* smpi_start_data_exe; //start of the data+bss segment of the executable -extern int smpi_size_data_exe; //size of the data+bss segment of the executable +extern XBT_PRIVATE double smpi_cpu_threshold; +extern XBT_PRIVATE double smpi_running_power; +extern XBT_PRIVATE int smpi_privatize_global_variables; +extern XBT_PRIVATE char* smpi_start_data_exe; //start of the data+bss segment of the executable +extern XBT_PRIVATE int smpi_size_data_exe; //size of the data+bss segment of the executable -void smpi_switch_data_segment(int dest); -void smpi_really_switch_data_segment(int dest); -int smpi_is_privatisation_file(char* file); +XBT_PRIVATE void smpi_switch_data_segment(int dest); +XBT_PRIVATE void smpi_really_switch_data_segment(int dest); +XBT_PRIVATE int smpi_is_privatisation_file(char* file); -void smpi_get_executable_global_size(void); -void smpi_initialize_global_memory_segments(void); -void smpi_destroy_global_memory_segments(void); -void smpi_bench_destroy(void); -void smpi_bench_begin(void); -void smpi_bench_end(void); +XBT_PRIVATE void smpi_get_executable_global_size(void); +XBT_PRIVATE void smpi_initialize_global_memory_segments(void); +XBT_PRIVATE void smpi_destroy_global_memory_segments(void); +XBT_PRIVATE void smpi_bench_destroy(void); +XBT_PRIVATE void smpi_bench_begin(void); +XBT_PRIVATE void smpi_bench_end(void); -void* smpi_get_tmp_sendbuffer(int size); -void* smpi_get_tmp_recvbuffer(int size); -void smpi_free_tmp_buffer(void* buf); +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); -int smpi_comm_attr_delete(MPI_Comm comm, int keyval); -int smpi_comm_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag); -int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value); +XBT_PRIVATE int smpi_comm_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag); +XBT_PRIVATE XBT_PRIVATE int smpi_comm_attr_delete(MPI_Comm comm, int keyval); +XBT_PRIVATE int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value); @@ -738,28 +739,28 @@ void mpi_comm_get_parent_ ( int*parent, int* ierr); /********** Tracing **********/ /* from smpi_instr.c */ -void TRACE_internal_smpi_set_category (const char *category); -const char *TRACE_internal_smpi_get_category (void); -void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_extra_data extra); -void TRACE_smpi_collective_out(int rank, int root, const char *operation); -void TRACE_smpi_computing_init(int rank); -void TRACE_smpi_computing_out(int rank); -void TRACE_smpi_computing_in(int rank, instr_extra_data extra); -void TRACE_smpi_sleeping_init(int rank); -void TRACE_smpi_sleeping_out(int rank); -void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra); -void TRACE_smpi_testing_out(int rank); -void TRACE_smpi_testing_in(int rank, instr_extra_data extra); -void TRACE_smpi_alloc(void); -void TRACE_smpi_release(void); -void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, instr_extra_data extra); -void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation); -void TRACE_smpi_send(int rank, int src, int dst, int size); -void TRACE_smpi_recv(int rank, int src, int dst); -void TRACE_smpi_init(int rank); -void TRACE_smpi_finalize(int rank); - -const char* encode_datatype(MPI_Datatype datatype, int* known); +XBT_PRIVATE void TRACE_internal_smpi_set_category (const char *category); +XBT_PRIVATE const char *TRACE_internal_smpi_get_category (void); +XBT_PRIVATE void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_extra_data extra); +XBT_PRIVATE void TRACE_smpi_collective_out(int rank, int root, const char *operation); +XBT_PRIVATE void TRACE_smpi_computing_init(int rank); +XBT_PRIVATE void TRACE_smpi_computing_out(int rank); +XBT_PRIVATE void TRACE_smpi_computing_in(int rank, instr_extra_data extra); +XBT_PRIVATE void TRACE_smpi_sleeping_init(int rank); +XBT_PRIVATE void TRACE_smpi_sleeping_out(int rank); +XBT_PRIVATE void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra); +XBT_PRIVATE void TRACE_smpi_testing_out(int rank); +XBT_PRIVATE void TRACE_smpi_testing_in(int rank, instr_extra_data extra); +XBT_PRIVATE void TRACE_smpi_alloc(void); +XBT_PRIVATE void TRACE_smpi_release(void); +XBT_PRIVATE void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation, instr_extra_data extra); +XBT_PRIVATE void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation); +XBT_PRIVATE void TRACE_smpi_send(int rank, int src, int dst, int size); +XBT_PRIVATE void TRACE_smpi_recv(int rank, int src, int dst); +XBT_PRIVATE void TRACE_smpi_init(int rank); +XBT_PRIVATE void TRACE_smpi_finalize(int rank); + +XBT_PRIVATE const char* encode_datatype(MPI_Datatype datatype, int* known); // TODO, make this static and expose it more cleanly @@ -768,11 +769,11 @@ typedef struct s_smpi_privatisation_region { int file_descriptor; } s_smpi_privatisation_region_t, *smpi_privatisation_region_t; -extern smpi_privatisation_region_t smpi_privatisation_regions; -extern int smpi_loaded_page; -extern int smpi_universe_size; +extern XBT_PRIVATE smpi_privatisation_region_t smpi_privatisation_regions; +extern XBT_PRIVATE int smpi_loaded_page; +extern XBT_PRIVATE int smpi_universe_size; -int SIMIX_process_get_PID(smx_process_t self); +XBT_PRIVATE int SIMIX_process_get_PID(smx_process_t self); static inline __attribute__ ((always_inline)) int smpi_process_index_of_smx_process(smx_process_t process) { diff --git a/src/smpi/smpi_mpi_dt_private.h b/src/smpi/smpi_mpi_dt_private.h index c88b436d9c..f0e612fcd5 100644 --- a/src/smpi/smpi_mpi_dt_private.h +++ b/src/smpi/smpi_mpi_dt_private.h @@ -9,6 +9,8 @@ #ifndef SMPI_DT_PRIVATE_H #define SMPI_DT_PRIVATE_H +#include + #include "private.h" #define DT_FLAG_DESTROYED 0x0001 /**< user destroyed but some other layers still have a reference */ @@ -98,115 +100,115 @@ typedef struct s_smpi_mpi_struct{ Functions to handle serialization/unserialization of messages, 3 for each type of MPI_Type One for creating the substructure to handle, one for serialization, one for unserialization */ -void unserialize_contiguous( const void *contiguous_vector, +XBT_PRIVATE void unserialize_contiguous( const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op); -void serialize_contiguous( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_contiguous( const void *noncontiguous_vector, void *contiguous_vector, int count, void *type); -void free_contiguous(MPI_Datatype* type); +XBT_PRIVATE void free_contiguous(MPI_Datatype* type); -s_smpi_mpi_contiguous_t* smpi_datatype_contiguous_create( MPI_Aint lb, +XBT_PRIVATE s_smpi_mpi_contiguous_t* smpi_datatype_contiguous_create( MPI_Aint lb, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_vector( const void *contiguous_vector, +XBT_PRIVATE void unserialize_vector( const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op); -void serialize_vector( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_vector( const void *noncontiguous_vector, void *contiguous_vector, int count, void *type); -void free_vector(MPI_Datatype* type); +XBT_PRIVATE void free_vector(MPI_Datatype* type); -s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride, +XBT_PRIVATE s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride, int block_length, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_hvector( const void *contiguous_vector, +XBT_PRIVATE void unserialize_hvector( const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op); -void serialize_hvector( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_hvector( const void *noncontiguous_vector, void *contiguous_vector, int count, void *type); -void free_hvector(MPI_Datatype* type); +XBT_PRIVATE void free_hvector(MPI_Datatype* type); -s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride, +XBT_PRIVATE s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride, int block_length, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_indexed( const void *contiguous_indexed, +XBT_PRIVATE void unserialize_indexed( const void *contiguous_indexed, void *noncontiguous_indexed, int count, void *type, MPI_Op op); -void serialize_indexed( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_indexed( const void *noncontiguous_vector, void *contiguous_vector, int count, void *type); -void free_indexed(MPI_Datatype* type); +XBT_PRIVATE void free_indexed(MPI_Datatype* type); -s_smpi_mpi_indexed_t* smpi_datatype_indexed_create(int* block_lengths, +XBT_PRIVATE s_smpi_mpi_indexed_t* smpi_datatype_indexed_create(int* block_lengths, int* block_indices, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_hindexed( const void *contiguous_indexed, +XBT_PRIVATE void unserialize_hindexed( const void *contiguous_indexed, void *noncontiguous_indexed, int count, void *type, MPI_Op op); -void serialize_hindexed( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_hindexed( const void *noncontiguous_vector, void *contiguous_vector, int count, void *type); -void free_hindexed(MPI_Datatype* type); +XBT_PRIVATE void free_hindexed(MPI_Datatype* type); -s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create(int* block_lengths, +XBT_PRIVATE s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create(int* block_lengths, MPI_Aint* block_indices, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_struct( const void *contiguous_indexed, +XBT_PRIVATE void unserialize_struct( const void *contiguous_indexed, void *noncontiguous_indexed, int count, void *type, MPI_Op op); -void serialize_struct( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_struct( const void *noncontiguous_vector, void *contiguous_vector, int count, void *type); -void free_struct(MPI_Datatype* type); +XBT_PRIVATE void free_struct(MPI_Datatype* type); -s_smpi_mpi_struct_t* smpi_datatype_struct_create(int* block_lengths, +XBT_PRIVATE s_smpi_mpi_struct_t* smpi_datatype_struct_create(int* block_lengths, MPI_Aint* block_indices, int block_count, MPI_Datatype* old_types);