added MPI_Wtime()

[simgrid.git] / include / smpi / smpi.h

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 8b0352b..bf5df23 100644 (file)
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -7,15 +7,10 @@
 #include <xbt/function_types.h>
 
 SG_BEGIN_DECL()
-
 #define SMPI_RAND_SEED 5
-
 #define MPI_ANY_SOURCE -1
-
 #define MPI_ANY_TAG -1
-
 #define MPI_UNDEFINED -1
-
 // errorcodes
 #define MPI_SUCCESS     0
 #define MPI_ERR_COMM    1
@@ -26,47 +21,46 @@ SG_BEGIN_DECL()
 #define MPI_ERR_COUNT   6
 #define MPI_ERR_RANK    7
 #define MPI_ERR_TAG     8
-
 // MPI_Comm
-typedef struct smpi_mpi_communicator_t *smpi_mpi_communicator_t;
-typedef smpi_mpi_communicator_t MPI_Comm;
+     typedef struct smpi_mpi_communicator_t *smpi_mpi_communicator_t;
+     typedef smpi_mpi_communicator_t MPI_Comm;
 
 // MPI_Datatype
-typedef struct smpi_mpi_datatype_t *smpi_mpi_datatype_t;
-typedef smpi_mpi_datatype_t MPI_Datatype;
+     typedef struct smpi_mpi_datatype_t *smpi_mpi_datatype_t;
+     typedef smpi_mpi_datatype_t MPI_Datatype;
 
 // MPI_Request
-typedef struct smpi_mpi_request_t *smpi_mpi_request_t;
-typedef smpi_mpi_request_t MPI_Request;
+     typedef struct smpi_mpi_request_t *smpi_mpi_request_t;
+     typedef smpi_mpi_request_t MPI_Request;
 
 // MPI_Op
-typedef struct smpi_mpi_op_t *smpi_mpi_op_t;
-typedef smpi_mpi_op_t MPI_Op;
+     typedef struct smpi_mpi_op_t *smpi_mpi_op_t;
+     typedef smpi_mpi_op_t MPI_Op;
 
 // MPI_Status
-struct smpi_mpi_status_t {
-  int MPI_SOURCE;
-  int MPI_TAG;
-  int MPI_ERROR;
-};
-typedef struct smpi_mpi_status_t smpi_mpi_status_t;
-typedef smpi_mpi_status_t MPI_Status;
+     struct smpi_mpi_status_t {
+       int MPI_SOURCE;
+       int MPI_TAG;
+       int MPI_ERROR;
+     };
+     typedef struct smpi_mpi_status_t smpi_mpi_status_t;
+     typedef smpi_mpi_status_t MPI_Status;
 
 // global SMPI data structure
-typedef struct smpi_mpi_global_t {
+     typedef struct smpi_mpi_global_t {
 
-       smpi_mpi_communicator_t mpi_comm_world;
+       smpi_mpi_communicator_t mpi_comm_world;
 
-       smpi_mpi_datatype_t     mpi_byte;
-       smpi_mpi_datatype_t     mpi_int;
-       smpi_mpi_datatype_t     mpi_double;
+       smpi_mpi_datatype_t mpi_byte;
+       smpi_mpi_datatype_t mpi_int;
+       smpi_mpi_datatype_t mpi_double;
 
-       smpi_mpi_op_t           mpi_land;
-       smpi_mpi_op_t           mpi_sum;
+       smpi_mpi_op_t mpi_land;
+       smpi_mpi_op_t mpi_sum;
 
-} s_smpi_mpi_global_t;
-typedef struct smpi_mpi_global_t *smpi_mpi_global_t;
-extern smpi_mpi_global_t smpi_mpi_global;
+     } s_smpi_mpi_global_t;
+     typedef struct smpi_mpi_global_t *smpi_mpi_global_t;
+     extern smpi_mpi_global_t smpi_mpi_global;
 
 #define MPI_COMM_WORLD    (smpi_mpi_global->mpi_comm_world)
 #define MPI_COMM_NULL     NULL
@@ -78,7 +72,7 @@ extern smpi_mpi_global_t smpi_mpi_global;
 #define MPI_INT           (smpi_mpi_global->mpi_int)
 
 #define MPI_LAND          (smpi_mpi_global->mpi_land)
-#define MPI_SUM           (smpi_mpi_glboal->mpi_sum)
+#define MPI_SUM           (smpi_mpi_global->mpi_sum)
 
 // MPI macros
 #define MPI_Init(a, b) SMPI_MPI_Init(a, b)
@@ -95,6 +89,7 @@ extern smpi_mpi_global_t smpi_mpi_global;
 #define MPI_Bcast(a, b, c, d, e) SMPI_MPI_Bcast(a, b, c, d, e)
 #define MPI_Wait(a, b) SMPI_MPI_Wait(a, b)
 #define MPI_Comm_split(a, b, c, d) SMPI_MPI_Comm_split(a, b, c, d)
+#define MPI_Wtime() SMPI_MPI_Wtime()
 
 // SMPI Functions
 XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);
@@ -102,15 +97,25 @@ XBT_PUBLIC(int) SMPI_MPI_Finalize(void);
 XBT_PUBLIC(int) SMPI_MPI_Abort(MPI_Comm comm, int errorcode);
 XBT_PUBLIC(int) SMPI_MPI_Comm_size(MPI_Comm comm, int *size);
 XBT_PUBLIC(int) SMPI_MPI_Comm_rank(MPI_Comm comm, int *rank);
-XBT_PUBLIC(int) SMPI_MPI_Type_size(MPI_Datatype datatype, size_t *size);
+XBT_PUBLIC(int) SMPI_MPI_Type_size(MPI_Datatype datatype, size_t * size);
 XBT_PUBLIC(int) SMPI_MPI_Barrier(MPI_Comm comm);
-XBT_PUBLIC(int) SMPI_MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request *request);
-XBT_PUBLIC(int) SMPI_MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status);
-XBT_PUBLIC(int) SMPI_MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request);
-XBT_PUBLIC(int) SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm);
-XBT_PUBLIC(int) SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm);
-XBT_PUBLIC(int) SMPI_MPI_Wait(MPI_Request *request, MPI_Status *status);
-XBT_PUBLIC(int) SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out);
+XBT_PUBLIC(int) SMPI_MPI_Irecv(void *buf, int count, MPI_Datatype datatype,
+                               int src, int tag, MPI_Comm comm,
+                               MPI_Request * request);
+XBT_PUBLIC(int) SMPI_MPI_Recv(void *buf, int count, MPI_Datatype datatype,
+                              int src, int tag, MPI_Comm comm,
+                              MPI_Status * status);
+XBT_PUBLIC(int) SMPI_MPI_Isend(void *buf, int count, MPI_Datatype datatype,
+                               int dst, int tag, MPI_Comm comm,
+                               MPI_Request * request);
+XBT_PUBLIC(int) SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype,
+                              int dst, int tag, MPI_Comm comm);
+XBT_PUBLIC(int) SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype,
+                               int root, MPI_Comm comm);
+XBT_PUBLIC(int) SMPI_MPI_Wait(MPI_Request * request, MPI_Status * status);
+XBT_PUBLIC(int) SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key,
+                                    MPI_Comm * comm_out);
+XBT_PUBLIC(double) SMPI_MPI_Wtime(void);
 
 // smpi functions
 XBT_IMPORT_NO_EXPORT(int) smpi_simulated_main(int argc, char **argv);
@@ -119,11 +124,10 @@ XBT_PUBLIC(void) smpi_exit(int);
 XBT_PUBLIC(int) smpi_gettimeofday(struct timeval *tv, struct timezone *tz);
 
 XBT_PUBLIC(void) smpi_do_once_1(const char *file, int line);
-XBT_PUBLIC(int)  smpi_do_once_2(void);
+XBT_PUBLIC(int) smpi_do_once_2(void);
 XBT_PUBLIC(void) smpi_do_once_3(void);
 
 #define SMPI_DO_ONCE for (smpi_do_once_1(__FILE__, __LINE__); smpi_do_once_2(); smpi_do_once_3())
 
 SG_END_DECL()
-
 #endif