updated to use branching-tree broadcast instead of for-loop.

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

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 5d08141..1a8c584 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -12,15 +12,24 @@
 #define SMPI_REQUEST_MALLOCATOR_SIZE 100
 #define SMPI_MESSAGE_MALLOCATOR_SIZE 100
 
+// smpi mpi communicator
 typedef struct smpi_mpi_communicator_t {
        int            size;
-       smx_host_t    *hosts;
-       smx_process_t *processes;
        int            barrier_count;
        smx_mutex_t    barrier_mutex;
        smx_cond_t     barrier_cond;
+
+       int           *rank_to_index_map;
+       int           *index_to_rank_map;
+
 } s_smpi_mpi_communicator_t;
 
+// smpi mpi datatype
+typedef struct smpi_mpi_datatype_t {
+  size_t size;
+} s_smpi_mpi_datatype_t;
+
+// smpi mpi request
 typedef struct smpi_mpi_request_t {
        smpi_mpi_communicator_t comm;
        int src;
@@ -28,16 +37,39 @@ typedef struct smpi_mpi_request_t {
        int tag;
 
        void *buf;
-       smpi_mpi_datatype_t datatype;
        int count;
+       smpi_mpi_datatype_t datatype;
 
        short int completed :1;
 
        smx_mutex_t mutex;
        smx_cond_t  cond;
+
+       void *data;
+       int forward;
+
 } s_smpi_mpi_request_t;
 
-typedef struct SMPI_Global {
+// smpi mpi op
+typedef struct smpi_mpi_op_t {
+  void (*func)(void *a, void *b, int *length, MPI_Datatype *datatype);
+} s_smpi_mpi_op_t;
+
+// smpi received message
+typedef struct smpi_received_message_t {
+       smpi_mpi_communicator_t comm;
+       int src;
+       int tag;
+
+       void *buf;
+
+       void *data;
+       int forward;
+
+} s_smpi_received_message_t;
+typedef struct smpi_received_message_t *smpi_received_message_t;
+
+typedef struct smpi_global_t {
 
        // config vars
        double            reference_speed;
@@ -48,6 +80,8 @@ typedef struct SMPI_Global {
        smx_mutex_t       start_stop_mutex;
        smx_cond_t        start_stop_cond;
 
+       smx_host_t       *hosts;
+       int               host_count;
        xbt_mallocator_t  request_mallocator;
        xbt_mallocator_t  message_mallocator;
 
@@ -69,45 +103,37 @@ typedef struct SMPI_Global {
        xbt_os_timer_t   *timers;
        smx_mutex_t      *timers_mutexes;
 
-} s_SMPI_Global_t, *SMPI_Global_t;
-extern SMPI_Global_t smpi_global;
+} s_smpi_global_t;
+typedef struct smpi_global_t *smpi_global_t;
+extern smpi_global_t smpi_global;
 
-typedef struct smpi_received_message_t {
-       smpi_mpi_communicator_t comm;
-       int src;
-       int dst;
-       int tag;
-       void *buf;
-} s_smpi_received_message_t;
-typedef struct smpi_received_message_t *smpi_received_message_t;
+typedef struct smpi_host_data_t {
+       int index;
+} s_smpi_host_data_t;
+typedef struct smpi_host_data_t *smpi_host_data_t;
 
 // function prototypes
-int smpi_mpi_comm_size(smpi_mpi_communicator_t comm);
-int smpi_mpi_comm_rank(smpi_mpi_communicator_t comm, smx_host_t host);
-int smpi_mpi_comm_rank_self(smpi_mpi_communicator_t comm);
-int smpi_mpi_comm_world_rank_self(void);
-int smpi_sender(int argc, char **argv);
-int smpi_receiver(int argc, char **argv);
-void *smpi_request_new(void);
-void smpi_request_free(void *pointer);
-void smpi_request_reset(void *pointer);
-void *smpi_message_new(void);
-void smpi_message_free(void *pointer);
-void smpi_message_reset(void *pointer);
-void smpi_global_init(void);
-void smpi_global_destroy(void);
-int smpi_run_simulation(int argc, char **argv);
-void smpi_mpi_land_func(void *x, void *y, void *z);
-void smpi_mpi_sum_func(void *x, void *y, void *z);
 void smpi_mpi_init(void);
 void smpi_mpi_finalize(void);
+int smpi_mpi_comm_rank(smpi_mpi_communicator_t comm);
+
+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);
+
 void smpi_bench_begin(void);
 void smpi_bench_end(void);
-void smpi_barrier(smpi_mpi_communicator_t comm);
+
+void smpi_global_init(void);
+void smpi_global_destroy(void);
+int smpi_host_index(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, smpi_mpi_communicator_t comm, smpi_mpi_request_t *request);
-int smpi_isend(smpi_mpi_request_t request);
-int smpi_irecv(smpi_mpi_request_t request);
-int smpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t *status);
+
+int smpi_sender(int argc, char **argv);
+
+int smpi_receiver(int argc, char **argv);
 
 #endif