X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/930a31488b75c8969603b0b36666e8fdcdcfd3a7..f3530c5f195681fb2baac1dfaa36a92eff3d6fc1:/src/smpi/private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 91d84892bb..c657011428 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -9,29 +9,28 @@
 
 #include "xbt.h"
 #include "xbt/xbt_os_time.h"
-#include "simix/simix.h"
+#include "simgrid/simix.h"
 #include "smpi/smpi.h"
-#include "instr/private.h"
+#include "smpi/smpif.h"
+#include "smpi/smpi_cocci.h"
+#include "instr/instr_private.h"
 
 struct s_smpi_process_data;
-typedef struct s_smpi_process_data* smpi_process_data_t;
+typedef struct s_smpi_process_data *smpi_process_data_t;
 
-#define PERSISTENT     0x0
-#define NON_PERSISTENT 0x1
-#define SEND           0x0
-#define RECV           0x2
+#define PERSISTENT     0x1
+#define NON_PERSISTENT 0x2
+#define SEND           0x4
+#define RECV           0x8
 
 typedef struct s_smpi_mpi_request {
-  void* buf;
+  void *buf;
   size_t size;
   int src;
   int dst;
   int tag;
   MPI_Comm comm;
-  smx_rdv_t rdv;
-  smx_comm_t pair;
-  int complete;
-  MPI_Request match;
+  smx_action_t action;
   unsigned flags;
 #ifdef HAVE_TRACING
   int send;
@@ -39,17 +38,24 @@ typedef struct s_smpi_mpi_request {
 #endif
 } s_smpi_mpi_request_t;
 
-void smpi_process_init(int* argc, char*** argv);
+void smpi_process_init(int *argc, char ***argv);
 void smpi_process_destroy(void);
+void smpi_process_finalize(void);
 
 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);
-int smpi_process_index(void);
+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_os_timer_t smpi_process_timer(void);
-void print_request(const char* message, MPI_Request request);
-void smpi_process_post_send(MPI_Comm comm, MPI_Request request);
-void smpi_process_post_recv(MPI_Request request);
+void smpi_process_simulated_start(void);
+double smpi_process_simulated_elapsed(void);
+
+void print_request(const char *message, MPI_Request request);
 
 void smpi_global_init(void);
 void smpi_global_destroy(void);
@@ -57,12 +63,34 @@ void smpi_global_destroy(void);
 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_extent(MPI_Datatype datatype, MPI_Aint* lb, MPI_Aint * extent);
-int smpi_datatype_copy(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype);
+int smpi_datatype_extent(MPI_Datatype datatype, MPI_Aint * lb,
+                         MPI_Aint * extent);
+int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+                       void *recvbuf, int recvcount,
+                       MPI_Datatype recvtype);
+int smpi_datatype_contiguous(int count, MPI_Datatype old_type,
+                       MPI_Datatype* new_type);
+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,
+                      MPI_Datatype old_type, MPI_Datatype* new_type);
+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,
+                     MPI_Datatype old_type, MPI_Datatype* new_type);
+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 flags);
+void smpi_datatype_free(MPI_Datatype* type);
+void smpi_datatype_commit(MPI_Datatype* datatype);
+
 
-MPI_Op smpi_op_new(MPI_User_function* function, int commute);
+
+MPI_Op smpi_op_new(MPI_User_function * function, int commute);
 void smpi_op_destroy(MPI_Op op);
-void smpi_op_apply(MPI_Op op, void* invec, void* inoutvec, int* len, MPI_Datatype* datatype);
+void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len,
+                   MPI_Datatype * datatype);
 
 MPI_Group smpi_group_new(int size);
 void smpi_group_destroy(MPI_Group group);
@@ -78,50 +106,156 @@ MPI_Comm smpi_comm_new(MPI_Group group);
 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);
 
-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, int src, int tag, MPI_Comm comm);
+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,
+                               int src, 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, int dst, int tag, MPI_Comm comm);
-MPI_Request smpi_mpi_isend(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, int src, int tag, MPI_Comm comm);
-MPI_Request smpi_mpi_irecv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm);
-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, int tag, MPI_Comm comm);
-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, 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[], MPI_Status* status);
-void smpi_mpi_waitall(int count, MPI_Request requests[],  MPI_Status status[]);
-int smpi_mpi_waitsome(int incount, MPI_Request requests[], int* indices, MPI_Status status[]);
-void smpi_mpi_bcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm);
+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,
+                            int dst, int tag, MPI_Comm comm);
+MPI_Request smpi_mpi_isend(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,
+                            int src, int tag, MPI_Comm comm);
+MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype,
+                           int src, int tag, MPI_Comm comm);
+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,
+                   int tag, MPI_Comm comm);
+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,
+                     MPI_Status * status);
+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);
+MPI_Request 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[],
+                     MPI_Status * status);
+void smpi_mpi_waitall(int count, MPI_Request requests[],
+                      MPI_Status status[]);
+int smpi_mpi_waitsome(int incount, MPI_Request requests[], int *indices,
+                      MPI_Status status[]);
+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, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm);
-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, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm);
-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, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm);
-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, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm);
-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, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-
-void nary_tree_bcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, int arity);
+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_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,
+                        MPI_Datatype sendtype, void *recvbuf,
+                        int recvcount, MPI_Datatype recvtype,
+                        MPI_Comm comm);
+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,
+                      void *recvbuf, int recvcount, MPI_Datatype recvtype,
+                      int root, MPI_Comm comm);
+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,
+                     MPI_Datatype datatype, MPI_Op op, int root,
+                     MPI_Comm comm);
+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,
+                   MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
+
+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);
 
-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, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm);
-int smpi_coll_tuned_alltoall_pairwise(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, int* senddisps, MPI_Datatype sendtype, void* recvbuf, int *recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm);
+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,
+                                          MPI_Datatype sendtype,
+                                          void *recvbuf, int recvcount,
+                                          MPI_Datatype recvtype,
+                                          MPI_Comm comm);
+int smpi_coll_tuned_alltoall_pairwise(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,
+                              int *senddisps, MPI_Datatype sendtype,
+                              void *recvbuf, int *recvcounts,
+                              int *recvdisps, MPI_Datatype recvtype,
+                              MPI_Comm comm);
 
 // utilities
 void smpi_bench_destroy(void);
-void smpi_bench_begin(int rank, const char* mpi_call);
-void smpi_bench_end(int rank, const char* mpi_call);
+void smpi_bench_begin(void);
+void smpi_bench_end(void);
+void smpi_execute_flops(double flops);
+
+// f77 wrappers
+void mpi_init__(int*);
+void mpi_finalize__(int*);
+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);
+
+void mpi_comm_dup__(int* comm, int* newcomm, int* ierr);
+void mpi_comm_split__(int* comm, int* color, int* key, int* comm_out, int* ierr);
+
+void mpi_send_init__(void *buf, int* count, int* datatype, int* dst, int* tag,
+                     int* comm, int* request, int* ierr);
+void mpi_isend__(void *buf, int* count, int* datatype, int* dst,
+                 int* tag, int* comm, int* request, int* ierr);
+void mpi_send__(void* buf, int* count, int* datatype, int* dst,
+                int* tag, int* comm, int* ierr);
+void mpi_recv_init__(void *buf, int* count, int* datatype, int* src, int* tag,
+                     int* comm, int* request, int* ierr);
+void mpi_irecv__(void *buf, int* count, int* datatype, int* src, int* tag,
+                 int* comm, int* request, int* ierr);
+void mpi_recv__(void* buf, int* count, int* datatype, int* src,
+                int* tag, int* comm, MPI_Status* status, int* ierr);
+void mpi_start__(int* request, int* ierr);
+void mpi_startall__(int* count, int* requests, int* ierr);
+void mpi_wait__(int* request, MPI_Status* status, int* ierr);
+void mpi_waitany__(int* count, int* requests, int* index, MPI_Status* status, int* ierr);
+void mpi_waitall__(int* count, int* requests, MPI_Status* status, int* ierr);
+
+void mpi_barrier__(int* comm, int* ierr);
+void mpi_bcast__(void* buf, int* count, int* datatype, int* root, int* comm, int* ierr);
+void mpi_reduce__(void* sendbuf, void* recvbuf, int* count,
+                  int* datatype, int* op, int* root, int* comm, int* ierr);
+void mpi_allreduce__(void* sendbuf, void* recvbuf, int* count, int* datatype,
+                     int* op, int* comm, int* ierr);
+void mpi_scatter__(void* sendbuf, int* sendcount, int* sendtype,
+                   void* recvbuf, int* recvcount, int* recvtype, 
+                   int* root, int* comm, int* ierr);
+void mpi_gather__(void* sendbuf, int* sendcount, int* sendtype,
+                  void* recvbuf, int* recvcount, int* recvtype,
+                  int* root, int* comm, int* ierr);
+void mpi_allgather__(void* sendbuf, int* sendcount, int* sendtype,
+                     void* recvbuf, int* recvcount, int* recvtype,
+                     int* comm, int* ierr);
+void mpi_scan__(void* sendbuf, void* recvbuf, int* count, int* datatype,
+                int* op, int* comm, int* ierr);
+void mpi_alltoall__(void* sendbuf, int* sendcount, int* sendtype,
+                    void* recvbuf, int* recvcount, int* recvtype, int* comm, int* ierr);
 
 #endif