X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e54471e47acaaa087f58c62c3ec142e911e30d40..1f32679abc2f9c0cae9e27951b643a0f70d71b3a:/src/smpi/private.h diff --git a/src/smpi/private.h b/src/smpi/private.h index f376662be5..ac7ec2e671 100644 --- a/src/smpi/private.h +++ b/src/smpi/private.h @@ -7,15 +7,15 @@ #ifndef SMPI_PRIVATE_H #define SMPI_PRIVATE_H +#include "simgrid/simix.h" +#include "smpi/smpi.h" +#include "src/include/smpi/smpi_interface.h" +#include "src/instr/instr_private.h" #include "src/internal_config.h" #include "xbt.h" #include "xbt/base.h" +#include "xbt/synchro.h" #include "xbt/xbt_os_time.h" -#include "xbt/synchro_core.h" -#include "simgrid/simix.h" -#include "src/include/smpi/smpi_interface.h" -#include "smpi/smpi.h" -#include "src/instr/instr_private.h" SG_BEGIN_DECL() @@ -77,6 +77,7 @@ typedef struct s_smpi_mpi_datatype{ #define COLL_TAG_GATHERV -2223 #define COLL_TAG_BCAST -3334 #define COLL_TAG_ALLREDUCE -4445 +#define SMPI_RMA_TAG -1234 #define MPI_COMM_UNINITIALIZED ((MPI_Comm)-1) @@ -99,7 +100,7 @@ typedef struct s_smpi_mpi_request { int truncated; size_t real_size; MPI_Comm comm; - smx_synchro_t action; + smx_activity_t action; unsigned flags; int detached; MPI_Request detached_sender; @@ -126,11 +127,11 @@ typedef struct s_smpi_mpi_info { int refcount; } s_smpi_mpi_info_t; -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); +XBT_PRIVATE void smpi_process_destroy(); +XBT_PRIVATE void smpi_process_finalize(); +XBT_PRIVATE int smpi_process_finalized(); +XBT_PRIVATE int smpi_process_initialized(); +XBT_PRIVATE void smpi_process_mark_as_initialized(); struct s_smpi_mpi_cart_topology; typedef struct s_smpi_mpi_cart_topology *MPIR_Cart_Topology; @@ -157,43 +158,44 @@ XBT_PRIVATE int smpi_mpi_cart_shift(MPI_Comm comm, int direction, int disp, int 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_data(); XBT_PRIVATE smpi_process_data_t smpi_process_remote_data(int index); // smpi_process_[set/get]_user_data must be public /* 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 int smpi_process_count(); +XBT_PRIVATE MPI_Comm smpi_process_comm_world(); +XBT_PRIVATE MPI_Comm smpi_process_get_comm_intra(); XBT_PRIVATE void smpi_process_set_comm_intra(MPI_Comm comm); -XBT_PRIVATE smx_mailbox_t smpi_process_mailbox(void); +XBT_PRIVATE smx_mailbox_t smpi_process_mailbox(); XBT_PRIVATE smx_mailbox_t smpi_process_remote_mailbox(int index); -XBT_PRIVATE smx_mailbox_t smpi_process_mailbox_small(void); +XBT_PRIVATE smx_mailbox_t smpi_process_mailbox_small(); XBT_PRIVATE smx_mailbox_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_mailboxes_mutex(); 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 xbt_os_timer_t smpi_process_timer(); +XBT_PRIVATE void smpi_process_simulated_start(); +XBT_PRIVATE double smpi_process_simulated_elapsed(); XBT_PRIVATE void smpi_process_set_sampling(int s); -XBT_PRIVATE int smpi_process_get_sampling(void); +XBT_PRIVATE int smpi_process_get_sampling(); XBT_PRIVATE void smpi_process_set_replaying(bool s); -XBT_PRIVATE bool smpi_process_get_replaying(void); +XBT_PRIVATE bool smpi_process_get_replaying(); -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_deployment_register_process(const char* instance_id, int rank, int index, MPI_Comm** comm, + msg_bar_t* bar); +XBT_PRIVATE void smpi_deployment_cleanup_instances(); -XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_synchro_t comm, void *buff, size_t buff_size); +XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_activity_t comm, void *buff, size_t buff_size); -XBT_PRIVATE void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm, void *buff, size_t buff_size); +XBT_PRIVATE void smpi_comm_null_copy_buffer_callback(smx_activity_t comm, void *buff, size_t buff_size); XBT_PRIVATE void print_request(const char *message, MPI_Request request); -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); -XBT_PRIVATE void smpi_mpi_init(void); +XBT_PRIVATE int smpi_enabled(); +XBT_PRIVATE void smpi_global_init(); +XBT_PRIVATE void smpi_global_destroy(); +XBT_PRIVATE double smpi_mpi_wtime(); +XBT_PRIVATE void smpi_mpi_init(); XBT_PRIVATE bool is_datatype_valid(MPI_Datatype datatype); @@ -399,7 +401,7 @@ XBT_PRIVATE int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MP XBT_PRIVATE int smpi_type_keyval_free(int* keyval); // utilities extern XBT_PRIVATE double smpi_cpu_threshold; -extern XBT_PRIVATE double smpi_running_power; +extern XBT_PRIVATE double smpi_host_speed; extern XBT_PRIVATE bool 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 @@ -408,12 +410,12 @@ 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); -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); +XBT_PRIVATE void smpi_get_executable_global_size(); +XBT_PRIVATE void smpi_initialize_global_memory_segments(); +XBT_PRIVATE void smpi_destroy_global_memory_segments(); +XBT_PRIVATE void smpi_bench_destroy(); +XBT_PRIVATE void smpi_bench_begin(); +XBT_PRIVATE void smpi_bench_end(); XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size); XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size); @@ -424,13 +426,13 @@ 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); // f77 wrappers -void mpi_init_(int*); -void mpi_finalize_(int*); +void mpi_init_(int* ierr); +void mpi_finalize_(int* ierr); void mpi_abort_(int* comm, int* errorcode, int* ierr); void mpi_comm_rank_(int* comm, int* rank, int* ierr); void mpi_comm_size_(int* comm, int* size, int* ierr); -double mpi_wtime_(void); -double mpi_wtick_(void); +double mpi_wtime_(); +double mpi_wtick_(); void mpi_initialized_(int* flag, int* ierr); void mpi_comm_dup_(int* comm, int* newcomm, int* ierr); @@ -677,11 +679,17 @@ void mpi_comm_spawn_ ( char *command, char *argv, int* maxprocs, int* info, int* void mpi_comm_spawn_multiple_ ( int* count, char *array_of_commands, char** array_of_argv, int* array_of_maxprocs, int* array_of_info, int* root, int* comm, int*intercomm, int* array_of_errcodes, int* ierr); void mpi_comm_get_parent_ ( int*parent, int* ierr); +void mpi_file_close_ ( int* file, int* ierr); +void mpi_file_delete_ ( char* filename, int* info, int* ierr); +void mpi_file_open_ ( int* comm, char* filename, int* amode, int* info, int* fh, int* ierr); +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); /********** Tracing **********/ /* from instr_smpi.c */ XBT_PRIVATE void TRACE_internal_smpi_set_category (const char *category); -XBT_PRIVATE const char *TRACE_internal_smpi_get_category (void); +XBT_PRIVATE const char *TRACE_internal_smpi_get_category (); 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); @@ -692,12 +700,12 @@ 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_alloc(); +XBT_PRIVATE void TRACE_smpi_release(); 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_send(int rank, int src, int dst, int tag, int size); +XBT_PRIVATE void TRACE_smpi_recv(int rank, int src, int dst, int tag); XBT_PRIVATE void TRACE_smpi_init(int rank); XBT_PRIVATE void TRACE_smpi_finalize(int rank); XBT_PRIVATE char *smpi_container(int rank, char *container, int n); @@ -715,10 +723,10 @@ extern XBT_PRIVATE smpi_privatisation_region_t smpi_privatisation_regions; extern XBT_PRIVATE int smpi_loaded_page; extern XBT_PRIVATE int smpi_universe_size; -XBT_PRIVATE int SIMIX_process_get_PID(smx_process_t self); +XBT_PRIVATE int SIMIX_process_get_PID(smx_actor_t self); static inline __attribute__ ((always_inline)) -int smpi_process_index_of_smx_process(smx_process_t process) { +int smpi_process_index_of_smx_process(smx_actor_t process) { return SIMIX_process_get_PID(process) -1; }