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
Added MPI_COMM_SELF.
[simgrid.git]
/
src
/
smpi
/
smpi_global.c
diff --git
a/src/smpi/smpi_global.c
b/src/smpi/smpi_global.c
index
2193fdc
..
2eaabc4
100644
(file)
--- a/
src/smpi/smpi_global.c
+++ b/
src/smpi/smpi_global.c
@@
-13,7
+13,7
@@
typedef struct s_smpi_process_data {
xbt_fifo_t pending_sent;
xbt_fifo_t pending_recv;
xbt_os_timer_t timer;
xbt_fifo_t pending_sent;
xbt_fifo_t pending_recv;
xbt_os_timer_t timer;
-
double simulated
;
+
MPI_Comm comm_self
;
} s_smpi_process_data_t;
static smpi_process_data_t* process_data = NULL;
} s_smpi_process_data_t;
static smpi_process_data_t* process_data = NULL;
@@
-45,16
+45,10
@@
xbt_os_timer_t smpi_process_timer(void) {
return data->timer;
}
return data->timer;
}
-
void smpi_process_simulated_reset
(void) {
+
MPI_Comm smpi_process_comm_self
(void) {
smpi_process_data_t data = smpi_process_data();
smpi_process_data_t data = smpi_process_data();
- data->simulated = SIMIX_get_clock();
-}
-
-double smpi_process_simulated_elapsed(void) {
- smpi_process_data_t data = smpi_process_data();
-
- return SIMIX_get_clock() - data->simulated;
+ return data->comm_self;
}
void smpi_process_post_send(MPI_Comm comm, MPI_Request request) {
}
void smpi_process_post_send(MPI_Comm comm, MPI_Request request) {
@@
-117,7
+111,6
@@
void smpi_process_post_recv(MPI_Request request) {
}
void smpi_global_init(void) {
}
void smpi_global_init(void) {
- double clock = SIMIX_get_clock();
int i;
MPI_Group group;
int i;
MPI_Group group;
@@
-130,7
+123,9
@@
void smpi_global_init(void) {
process_data[i]->pending_sent = xbt_fifo_new();
process_data[i]->pending_recv = xbt_fifo_new();
process_data[i]->timer = xbt_os_timer_new();
process_data[i]->pending_sent = xbt_fifo_new();
process_data[i]->pending_recv = xbt_fifo_new();
process_data[i]->timer = xbt_os_timer_new();
- process_data[i]->simulated = clock;
+ group = smpi_group_new(1);
+ process_data[i]->comm_self = smpi_comm_new(group);
+ smpi_group_set_mapping(group, i, 0);
}
group = smpi_group_new(process_count);
MPI_COMM_WORLD = smpi_comm_new(group);
}
group = smpi_group_new(process_count);
MPI_COMM_WORLD = smpi_comm_new(group);
@@
-146,6
+141,7
@@
void smpi_global_destroy(void) {
smpi_comm_destroy(MPI_COMM_WORLD);
MPI_COMM_WORLD = MPI_COMM_NULL;
for(i = 0; i < count; i++) {
smpi_comm_destroy(MPI_COMM_WORLD);
MPI_COMM_WORLD = MPI_COMM_NULL;
for(i = 0; i < count; i++) {
+ smpi_comm_destroy(process_data[i]->comm_self);
xbt_os_timer_free(process_data[i]->timer);
xbt_fifo_free(process_data[i]->pending_recv);
xbt_fifo_free(process_data[i]->pending_sent);
xbt_os_timer_free(process_data[i]->timer);
xbt_fifo_free(process_data[i]->pending_recv);
xbt_fifo_free(process_data[i]->pending_sent);