X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e52278566439b20cb46f86ccc08e5cf451f651bd..773e09f91e02cdd7e30e221f2bd6f39e97896b16:/src/smpi/private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 413d6d1c55..3a5c8fa8af 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -1,29 +1,78 @@
 #ifndef SMPI_PRIVATE_H
 #define SMPI_PRIVATE_H
 
-#include "simix/simix.h"
 #include "xbt/mallocator.h"
 #include "xbt/xbt_os_time.h"
+
+#include "simix/simix.h"
+
 #include "smpi/smpi.h"
 
 #define SMPI_DEFAULT_SPEED 100
 #define SMPI_REQUEST_MALLOCATOR_SIZE 100
 #define SMPI_MESSAGE_MALLOCATOR_SIZE 100
+// FIXME: should probably be dynamic datatype...
+// or could include code to dynamically expand when full
+#define SMPI_MAX_TIMES 10
 
-typedef struct smpi_mpi_communicator_simdata {
-	smx_host_t    *hosts;
-	smx_process_t *processes;
+// smpi mpi communicator
+typedef struct smpi_mpi_communicator_t {
+	int            size;
 	int            barrier_count;
 	smx_mutex_t    barrier_mutex;
 	smx_cond_t     barrier_cond;
-} s_smpi_mpi_communicator_simdata_t;
 
-typedef struct smpi_mpi_request_simdata {
+	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;
+	int dst;
+	int tag;
+
+	void *buf;
+	int count;
+	smpi_mpi_datatype_t datatype;
+
+	short int completed :1;
+
 	smx_mutex_t mutex;
 	smx_cond_t  cond;
-} s_smpi_mpi_request_simdata_t;
 
-typedef struct SMPI_Global {
+	void *data;
+	int forward;
+
+} s_smpi_mpi_request_t;
+
+// 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;
@@ -34,6 +83,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;
 
@@ -52,49 +103,52 @@ typedef struct SMPI_Global {
 	int               running_hosts_count;
 	smx_mutex_t       running_hosts_count_mutex;
 
-	xbt_os_timer_t   *timers;
-	smx_mutex_t      *timers_mutexes;
+	// FIXME: maybe all code needs to lock timer?
+	xbt_os_timer_t    timer;
+	smx_mutex_t       timer_mutex;
+	smx_cond_t        timer_cond;
 
-} s_SMPI_Global_t, *SMPI_Global_t;
-extern SMPI_Global_t smpi_global;
+	// keeps track of previous times
+	double	          times[SMPI_MAX_TIMES];
+	int               times_max;
+	smx_mutex_t       times_mutex;
 
-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;
+	smx_mutex_t       execute_mutex;
+	smx_cond_t        execute_cond;
+
+} s_smpi_global_t;
+typedef struct smpi_global_t *smpi_global_t;
+extern smpi_global_t smpi_global;
+
+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_execute(double duration);
 void smpi_bench_begin(void);
-void smpi_bench_end(void);
-void smpi_barrier(smpi_mpi_communicator_t *comm);
-int smpi_comm_rank(smpi_mpi_communicator_t *comm, smx_host_t host);
-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);
-void smpi_wait(smpi_mpi_request_t *request, smpi_mpi_status_t *status);
+double smpi_bench_end(void);
+void smpi_bench_skip(void);
+
+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_sender(int argc, char **argv);
+
+int smpi_receiver(int argc, char **argv);
 
 #endif