A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move pending_recv_request_queues into host_data (ie, wanna be process_data)
[simgrid.git]
/
src
/
smpi
/
private.h
diff --git
a/src/smpi/private.h
b/src/smpi/private.h
index
8e215a6
..
5f79622
100644
(file)
--- a/
src/smpi/private.h
+++ b/
src/smpi/private.h
@@
-11,19
+11,16
@@
#define SMPI_DEFAULT_SPEED 100
#define SMPI_REQUEST_MALLOCATOR_SIZE 100
#define SMPI_MESSAGE_MALLOCATOR_SIZE 100
#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
// smpi mpi communicator
typedef struct smpi_mpi_communicator_t {
// smpi mpi communicator
typedef struct smpi_mpi_communicator_t {
-
int
size;
-
int
barrier_count;
-
smx_mutex_t
barrier_mutex;
-
smx_cond_t
barrier_cond;
+
int
size;
+
int
barrier_count;
+
smx_mutex_t
barrier_mutex;
+
smx_cond_t
barrier_cond;
-
int
*rank_to_index_map;
-
int
*index_to_rank_map;
+
int
*rank_to_index_map;
+
int
*index_to_rank_map;
} s_smpi_mpi_communicator_t;
} s_smpi_mpi_communicator_t;
@@
-34,114
+31,128
@@
typedef struct smpi_mpi_datatype_t {
// smpi mpi request
typedef struct smpi_mpi_request_t {
// smpi mpi request
typedef struct smpi_mpi_request_t {
-
smpi_mpi_communicator_t comm;
-
int src;
-
int dst;
-
int tag;
+ smpi_mpi_communicator_t comm;
+ int src;
+ int dst;
+ int tag;
-
void *buf;
-
int count;
-
smpi_mpi_datatype_t datatype;
+ void *buf;
+ int count;
+ smpi_mpi_datatype_t datatype;
-
short int completed
:1;
+
short int completed
:1;
-
smx_mutex_t mutex;
-
smx_cond_t
cond;
+ smx_mutex_t mutex;
+
smx_cond_t
cond;
-
void *data;
-
int forward;
+ void *data;
+ int forward;
} s_smpi_mpi_request_t;
// smpi mpi op
typedef struct smpi_mpi_op_t {
} 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);
+ 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 {
} s_smpi_mpi_op_t;
// smpi received message
typedef struct smpi_received_message_t {
-
smpi_mpi_communicator_t comm;
-
int src;
-
int tag;
+ smpi_mpi_communicator_t comm;
+ int src;
+ int tag;
-
void *buf;
+ void *buf;
-
void *data;
-
int forward;
+ void *data;
+ int forward;
} s_smpi_received_message_t;
typedef struct smpi_received_message_t *smpi_received_message_t;
} s_smpi_received_message_t;
typedef struct smpi_received_message_t *smpi_received_message_t;
-typedef struct smpi_global_t {
+typedef struct smpi_do_once_duration_node_t {
+ char *file;
+ int line;
+ double duration;
+ struct smpi_do_once_duration_node_t *next;
+} s_smpi_do_once_duration_node_t;
+typedef struct smpi_do_once_duration_node_t *smpi_do_once_duration_node_t;
- // config vars
- double reference_speed;
+typedef struct smpi_global_t {
- // state vars
- int root_ready:1;
- int ready_process_count;
- smx_mutex_t start_stop_mutex;
- smx_cond_t start_stop_cond;
+ // config vars
+ double reference_speed;
- smx_host_t *hosts;
- int host_count;
- xbt_mallocator_t request_mallocator;
- xbt_mallocator_t message_mallocator;
+ // state vars
- xbt_fifo_t *pending_send_request_queues;
- smx_mutex_t *pending_send_request_queues_mutexes;
+ smx_host_t *hosts;
+ int host_count;
+ xbt_mallocator_t request_mallocator;
+ xbt_mallocator_t message_mallocator;
- xbt_fifo_t *pending_recv_request_queues;
- smx_mutex_t *pending_recv_request_queues_mutexes;
+ // FIXME: request queues should be moved to host data...
+ xbt_fifo_t *pending_send_request_queues;
+ xbt_fifo_t *received_message_queues;
-
xbt_fifo_t *received_message_queu
es;
-
smx_mutex_t *received_message_queues_mutex
es;
+
smx_process_t *sender_process
es;
+
smx_process_t *receiver_process
es;
- smx_process_t *sender_processes;
- smx_process_t *receiver_processes;
+ int running_hosts_count;
- int running_hosts_count;
- smx_mutex_t running_hosts_count_mutex;
+ xbt_os_timer_t timer;
+ smx_mutex_t timer_mutex;
+ smx_cond_t timer_cond;
- xbt_os_timer_t timer;
- smx_mutex_t timer_mutex;
- smx_cond_t timer_cond;
- double times[SMPI_MAX_TIMES];
- int times_max;
- smx_mutex_t times_mutex;
+ // keeps track of previous times
+ smpi_do_once_duration_node_t do_once_duration_nodes;
+ smx_mutex_t do_once_mutex;
+ double *do_once_duration;
} s_smpi_global_t;
typedef struct smpi_global_t *smpi_global_t;
extern smpi_global_t smpi_global;
typedef struct smpi_host_data_t {
} 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;
+ int index;
+ smx_mutex_t mutex;
+ smx_cond_t cond;
+
+ smx_process_t main;
+ smx_process_t sender;
+ smx_process_t receiver;
+
+ xbt_fifo_t pending_recv_request_queue;
} s_smpi_host_data_t;
typedef struct smpi_host_data_t *smpi_host_data_t;
// function prototypes
} s_smpi_host_data_t;
typedef struct smpi_host_data_t *smpi_host_data_t;
// function prototypes
-void smpi_
mpi
_init(void);
-void smpi_
mpi
_finalize(void);
+void smpi_
process
_init(void);
+void smpi_
process
_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_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);
+int smpi_mpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t *
status);
+void smpi_execute(double duration);
+void smpi_start_timer(void);
+double smpi_stop_timer(void);
void smpi_bench_begin(void);
void smpi_bench_begin(void);
-
double
smpi_bench_end(void);
+
void
smpi_bench_end(void);
void smpi_bench_skip(void);
void smpi_global_init(void);
void smpi_global_destroy(void);
int smpi_host_index(void);
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_run_simulation(int *argc, char **argv);
int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
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 src, int dst, int tag,
+ smpi_mpi_communicator_t comm,
+
smpi_mpi_request_t * request
);
-int smpi_receiver(int argc, char **argv);
+int smpi_sender(int argc,char*argv[]);
+int smpi_receiver(int argc, char*argv[]);
#endif
#endif