wrapping global variables in structs. not finished so smpi probably won't

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

diff --git a/src/smpi/include/smpi.h b/src/smpi/include/smpi.h
index a007c9c..2674928 100644 (file)
--- a/src/smpi/include/smpi.h
+++ b/src/smpi/include/smpi.h
@@ -1,6 +1,5 @@
-#define SMPI_DEFAULT_SPEED 100
-#define SMPI_REQUEST_MALLOCATOR_SIZE 100
-#define SMPI_MESSAGE_MALLOCATOR_SIZE 100
+#include <xbt/function_types.h>
+#include <simix/simix.h>
 
 #define SMPI_RAND_SEED 5
 
@@ -17,22 +16,18 @@
 #define MPI_ERR_RANK    7
 #define MPI_ERR_TAG     8
 
-#include <xbt/function_types.h>
-#include <simix/simix.h>
-
 // MPI_Comm
 struct smpi_mpi_communicator_t {
-  int size;
-  int barrier;
-  smx_mutex_t barrier_mutex;
-  smx_cond_t barrier_cond;
-  smx_host_t *hosts;
+  int            size;
+  smx_host_t    *hosts;
+
   smx_process_t *processes;
+  int            barrier_count;
+  smx_mutex_t    barrier_mutex;
+  smx_cond_t     barrier_cond;
 };
 typedef struct smpi_mpi_communicator_t smpi_mpi_communicator_t;
 typedef smpi_mpi_communicator_t *MPI_Comm;
-extern smpi_mpi_communicator_t smpi_mpi_comm_world;
-#define MPI_COMM_WORLD (&smpi_mpi_comm_world)
 
 // MPI_Status
 struct smpi_mpi_status_t {
@@ -40,8 +35,6 @@ struct smpi_mpi_status_t {
 };
 typedef struct smpi_mpi_status_t smpi_mpi_status_t;
 typedef smpi_mpi_status_t MPI_Status;
-extern smpi_mpi_status_t smpi_mpi_status_ignore;
-#define MPI_STATUS_IGNORE (&smpi_mpi_status_ignore)
 
 // MPI_Datatype
 struct smpi_mpi_datatype_t {
@@ -49,13 +42,6 @@ struct smpi_mpi_datatype_t {
 };
 typedef struct smpi_mpi_datatype_t smpi_mpi_datatype_t;
 typedef smpi_mpi_datatype_t *MPI_Datatype;
-// FIXME: add missing datatypes
-extern smpi_mpi_datatype_t smpi_mpi_byte;
-#define MPI_BYTE (&smpi_mpi_byte)
-extern smpi_mpi_datatype_t smpi_mpi_int;
-#define MPI_INT (&smpi_mpi_int)
-extern smpi_mpi_datatype_t smpi_mpi_double;
-#define MPI_DOUBLE (&smpi_mpi_double)
 
 // MPI_Request
 struct smpi_mpi_request_t {
@@ -63,38 +49,53 @@ struct smpi_mpi_request_t {
        int src;
        int dst;
        int tag;
+
        void *buf;
-       int count;
        smpi_mpi_datatype_t *datatype;
-       smx_mutex_t mutex;
-       smx_cond_t cond;
+       int count;
+
        short int completed :1;
+       smx_mutex_t mutex;
+       smx_cond_t  cond;
        xbt_fifo_t waitlist;
 };
 typedef struct smpi_mpi_request_t smpi_mpi_request_t;
 typedef smpi_mpi_request_t *MPI_Request;
 
-// smpi_received_message_t
-struct smpi_received_message_t {
-       smpi_mpi_communicator_t *comm;
-       int src;
-       int dst;
-       int tag;
-       void *buf;
-};
-typedef struct smpi_received_message_t smpi_received_message_t;
-
 // MPI_Op
 struct smpi_mpi_op_t {
   void (*func)(void *x, void *y, void *z);
 };
 typedef struct smpi_mpi_op_t smpi_mpi_op_t;
 typedef smpi_mpi_op_t *MPI_Op;
-extern smpi_mpi_op_t smpi_mpi_land;
-#define MPI_LAND (&smpi_mpi_land)
-extern smpi_mpi_op_t smpi_mpi_sum;
-#define MPI_SUM (&smpi_mpi_sum)
 
+// global SMPI data structure
+typedef struct SMPI_MPI_Global {
+
+       smpi_mpi_communicator_t mpi_comm_world;
+
+       smpi_mpi_status_t       mpi_status_ignore;
+
+       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;
+
+} s_SMPI_MPI_Global_t, *SMPI_MPI_Global_t;
+exterm SMPI_MPI_Global_t smpi_mpi_global;
+
+#define MPI_COMM_WORLD    (smpi_mpi_global->mpi_comm_world)
+
+#define MPI_STATUS_IGNORE (smpi_mpi_global->mpi_status_ignore)
+
+#define MPI_BYTE          (smpi_mpi_global->mpi_byte)
+#define MPI_DOUBLE        (smpi_mpi_global->mpi_double)
+#define MPI_INT           (smpi_mpi_global->mpi_int)
+
+#define MPI_LAND          (smpi_mpi_global->mpi_land)
+#define MPI_SUM           (smpi_mpi_glboal->mpi_sum)
 
 // smpi functions
 extern int smpi_simulated_main(int argc, char **argv);