X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b6830658ae00f48fbca5a43ed666c98301b163c..6760cb07d6b57be16928d95339d71e57c4e24f36:/src/smpi/private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 07e645a089..1265260410 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -1,7 +1,13 @@
+/* Copyright (c) 2007, 2009, 2010. 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. */
+
 #ifndef SMPI_PRIVATE_H
 #define SMPI_PRIVATE_H
 
-#include "xbt/mallocator.h"
+#include "xbt.h"
 #include "xbt/xbt_os_time.h"
 #include "simix/simix.h"
 #include "smpi/smpi.h"
@@ -9,15 +15,24 @@
 struct s_smpi_process_data;
 typedef struct s_smpi_process_data* smpi_process_data_t;
 
+#define PERSISTENT     0x0
+#define NON_PERSISTENT 0x1
+#define SEND           0x0
+#define RECV           0x2
+
 typedef struct s_smpi_mpi_request {
-  MPI_Comm comm;
+  void* buf;
+  size_t size;
   int src;
   int dst;
   int tag;
-  size_t size;
+  MPI_Comm comm;
   smx_rdv_t rdv;
   smx_comm_t pair;
   int complete;
+  MPI_Request match;
+  unsigned flags;
+  MPI_Request ack;
 } s_smpi_mpi_request_t;
 
 void smpi_process_init(int* argc, char*** argv);
@@ -28,8 +43,7 @@ smpi_process_data_t smpi_process_remote_data(int index);
 int smpi_process_count(void);
 int smpi_process_index(void);
 xbt_os_timer_t smpi_process_timer(void);
-void smpi_process_simulated_reset(void);
-double smpi_process_simulated_elapsed(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);
 
@@ -62,10 +76,17 @@ MPI_Group smpi_comm_group(MPI_Comm comm);
 int smpi_comm_size(MPI_Comm comm);
 int smpi_comm_rank(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 src, int tag, MPI_Comm comm);
+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);
@@ -83,6 +104,7 @@ void smpi_mpi_scatter(void* sendbuf, int sendcount, MPI_Datatype sendtype, void*
 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);
@@ -93,7 +115,7 @@ int smpi_coll_tuned_alltoall_pairwise(void* sendbuf, int sendcount, MPI_Datatype
 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_begin(const char* mpi_call);
-void smpi_bench_end(void);
+void smpi_bench_begin(int rank, const char* mpi_call);
+void smpi_bench_end(int rank, const char* mpi_call);
 
 #endif