Implement MPI_Waitany and MPI_Waitall

[simgrid.git] / src / smpi / private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 109ce231a59f04301d4f3deab5d6113d4b373e62..115b23f17a924d3a72b2bc5c490d5baded69f3d8 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -41,6 +41,7 @@ typedef struct smpi_mpi_request_t {
   smpi_mpi_datatype_t datatype;
 
   short int completed:1;
+  short int consumed:1; /* for waitany */
 
   smx_mutex_t mutex;
   smx_cond_t cond;
@@ -83,9 +84,7 @@ typedef struct smpi_global_t {
   double reference_speed;
 
   // state vars
-
-  smx_host_t *hosts; //FIXME:killme
-  int host_count;
+  int process_count;
   xbt_mallocator_t request_mallocator;
   xbt_mallocator_t message_mallocator;
 
@@ -118,11 +117,11 @@ typedef struct smpi_host_data_t {
   xbt_fifo_t pending_recv_request_queue;
   xbt_fifo_t pending_send_request_queue;
   xbt_fifo_t received_message_queue;
-} s_smpi_host_data_t;
-typedef struct smpi_host_data_t *smpi_host_data_t;
+} s_smpi_process_data_t;
+typedef struct smpi_host_data_t *smpi_process_data_t;
 
 // function prototypes
-void smpi_process_init(void);
+void smpi_process_init(int *argc,char ***argv);
 void smpi_process_finalize(void);
 int smpi_mpi_comm_rank(smpi_mpi_communicator_t comm);
 
@@ -130,6 +129,8 @@ int smpi_mpi_barrier(smpi_mpi_communicator_t comm);
 int smpi_mpi_isend(smpi_mpi_request_t request);
 int smpi_mpi_irecv(smpi_mpi_request_t request);
 int smpi_mpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t * status);
+int smpi_mpi_wait_all(int count, smpi_mpi_request_t *requests, smpi_mpi_status_t **status);
+int smpi_mpi_wait_any(int count, smpi_mpi_request_t *requests, int *index, smpi_mpi_status_t *status);
 
 void smpi_execute(double duration);
 void smpi_start_timer(void);
@@ -140,9 +141,9 @@ void smpi_bench_skip(void);
 
 void smpi_global_init(void);
 void smpi_global_destroy(void);
-int smpi_host_index(void);
-smx_mutex_t smpi_host_mutex(void);
-smx_cond_t smpi_host_cond(void);
+int smpi_process_index(void);
+smx_mutex_t smpi_process_mutex(void);
+smx_cond_t smpi_process_cond(void);
 int smpi_run_simulation(int *argc, char **argv);
 int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
                         int src, int dst, int tag,