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
1b214f3
..
5f79622
100644
(file)
--- a/
src/smpi/private.h
+++ b/
src/smpi/private.h
@@
-83,10
+83,6
@@
typedef struct smpi_global_t {
double reference_speed;
// state vars
double reference_speed;
// state vars
- int root_ready:1;
- int ready_process_count;
- smx_mutex_t start_stop_mutex;
- smx_cond_t start_stop_cond;
smx_host_t *hosts;
int host_count;
smx_host_t *hosts;
int host_count;
@@
-95,19
+91,12
@@
typedef struct smpi_global_t {
// FIXME: request queues should be moved to host data...
xbt_fifo_t *pending_send_request_queues;
// FIXME: request queues should be moved to host data...
xbt_fifo_t *pending_send_request_queues;
- smx_mutex_t *pending_send_request_queues_mutexes;
-
- xbt_fifo_t *pending_recv_request_queues;
- smx_mutex_t *pending_recv_request_queues_mutexes;
-
xbt_fifo_t *received_message_queues;
xbt_fifo_t *received_message_queues;
- smx_mutex_t *received_message_queues_mutexes;
smx_process_t *sender_processes;
smx_process_t *receiver_processes;
int running_hosts_count;
smx_process_t *sender_processes;
smx_process_t *receiver_processes;
int running_hosts_count;
- smx_mutex_t running_hosts_count_mutex;
xbt_os_timer_t timer;
smx_mutex_t timer_mutex;
xbt_os_timer_t timer;
smx_mutex_t timer_mutex;
@@
-126,12
+115,18
@@
typedef struct smpi_host_data_t {
int index;
smx_mutex_t mutex;
smx_cond_t cond;
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_comm_rank(smpi_mpi_communicator_t comm);
int smpi_mpi_barrier(smpi_mpi_communicator_t comm);
@@
-157,8
+152,7
@@
int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
smpi_mpi_communicator_t comm,
smpi_mpi_request_t * request);
smpi_mpi_communicator_t comm,
smpi_mpi_request_t * request);
-int smpi_sender(int argc, char **argv);
-
-int smpi_receiver(int argc, char **argv);
+int smpi_sender(int argc,char*argv[]);
+int smpi_receiver(int argc, char*argv[]);
#endif
#endif