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
kill trivial MSG_task_has_data() and use get_data()!=NULL instead
[simgrid.git]
/
src
/
smpi
/
smpi_global.c
diff --git
a/src/smpi/smpi_global.c
b/src/smpi/smpi_global.c
index
403d5d6
..
6dae568
100644
(file)
--- a/
src/smpi/smpi_global.c
+++ b/
src/smpi/smpi_global.c
@@
-13,6
+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;
+ 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;
@@
-44,6
+45,12
@@
xbt_os_timer_t smpi_process_timer(void) {
return data->timer;
}
return data->timer;
}
+MPI_Comm smpi_process_comm_self(void) {
+ smpi_process_data_t data = smpi_process_data();
+
+ return data->comm_self;
+}
+
void smpi_process_post_send(MPI_Comm comm, MPI_Request request) {
int index = smpi_group_index(smpi_comm_group(comm), request->dst);
smpi_process_data_t data = smpi_process_remote_data(index);
void smpi_process_post_send(MPI_Comm comm, MPI_Request request) {
int index = smpi_group_index(smpi_comm_group(comm), request->dst);
smpi_process_data_t data = smpi_process_remote_data(index);
@@
-62,6
+69,7
@@
void smpi_process_post_send(MPI_Comm comm, MPI_Request request) {
/* Materialize the *_ANY_* fields from corresponding irecv request */
req->src = request->src;
req->tag = request->tag;
/* Materialize the *_ANY_* fields from corresponding irecv request */
req->src = request->src;
req->tag = request->tag;
+ req->data = request->data;
request->rdv = req->rdv;
return;
} else {
request->rdv = req->rdv;
return;
} else {
@@
-90,6
+98,7
@@
void smpi_process_post_recv(MPI_Request request) {
/* Materialize the *_ANY_* fields from the irecv request */
request->src = req->src;
request->tag = req->tag;
/* Materialize the *_ANY_* fields from the irecv request */
request->src = req->src;
request->tag = req->tag;
+ request->data = req->data;
request->rdv = req->rdv;
return;
} else {
request->rdv = req->rdv;
return;
} else {
@@
-114,6
+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();
+ 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);
@@
-129,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);
@@
-152,6
+165,11
@@
int main(int argc, char **argv)
"Boolean indicating whether we should display the timing after simulation.",
xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, NULL);
"Boolean indicating whether we should display the timing after simulation.",
xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, NULL);
+ int default_display_smpe = 0;
+ xbt_cfg_register(&_surf_cfg_set, "SMPE",
+ "Boolean indicating whether we should display simulated time spent in MPI calls.",
+ xbt_cfgelm_int, &default_display_smpe, 1, 1, NULL, NULL);
+
SIMIX_global_init(&argc, argv);
// parse the platform file: get the host list
SIMIX_global_init(&argc, argv);
// parse the platform file: get the host list
@@
-168,12
+186,14
@@
int main(int argc, char **argv)
SIMIX_init();
while (SIMIX_solve(NULL, NULL) != -1.0);
SIMIX_init();
while (SIMIX_solve(NULL, NULL) != -1.0);
-
+
if (xbt_cfg_get_int(_surf_cfg_set, "display_timing"))
INFO1("simulation time %g", SIMIX_get_clock());
smpi_global_destroy();
if (xbt_cfg_get_int(_surf_cfg_set, "display_timing"))
INFO1("simulation time %g", SIMIX_get_clock());
smpi_global_destroy();
+ SIMIX_message_sizes_output("toto.txt");
+
SIMIX_clean();
return 0;
}
SIMIX_clean();
return 0;
}