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
Get smpirun displaying the real process rank
[simgrid.git]
/
src
/
smpi
/
smpi_sender.c
diff --git
a/src/smpi/smpi_sender.c
b/src/smpi/smpi_sender.c
index
ae5a74e
..
3587863
100644
(file)
--- a/
src/smpi/smpi_sender.c
+++ b/
src/smpi/smpi_sender.c
@@
-4,7
+4,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_sender, smpi,
"Logging specific to SMPI (sender)");
int smpi_sender(int argc,char*argv[]) {
"Logging specific to SMPI (sender)");
int smpi_sender(int argc,char*argv[]) {
- smpi_
host
_data_t mydata = SIMIX_process_get_data(SIMIX_process_self());
+ smpi_
process
_data_t mydata = SIMIX_process_get_data(SIMIX_process_self());
smx_process_t self;
smx_host_t shost;
smx_process_t self;
smx_host_t shost;
@@
-48,7
+48,8
@@
int smpi_sender(int argc,char*argv[]) {
request->datatype->size * request->count);
dindex = request->comm->rank_to_index_map[request->dst];
request->datatype->size * request->count);
dindex = request->comm->rank_to_index_map[request->dst];
- dhost = smpi_global->hosts[dindex];
+ smpi_process_data_t remote_process = SIMIX_process_get_data(smpi_global->main_processes[dindex]);
+ dhost = SIMIX_process_get_host(smpi_global->main_processes[dindex]);
message->forward = (request->forward - 1) / 2;
request->forward = request->forward / 2;
message->forward = (request->forward - 1) / 2;
request->forward = request->forward / 2;
@@
-76,7
+77,7
@@
int smpi_sender(int argc,char*argv[]) {
SIMIX_cond_wait(request->cond, request->mutex);
}
SIMIX_cond_wait(request->cond, request->mutex);
}
- xbt_fifo_push(
smpi_global->received_message_queues[dindex]
, message);
+ xbt_fifo_push(
remote_process->received_message_queue
, message);
SIMIX_unregister_action_to_condition(action, request->cond);
SIMIX_action_destroy(action);
SIMIX_unregister_action_to_condition(action, request->cond);
SIMIX_action_destroy(action);
@@
-84,8
+85,7
@@
int smpi_sender(int argc,char*argv[]) {
SIMIX_mutex_unlock(request->mutex);
// wake up receiver if necessary
SIMIX_mutex_unlock(request->mutex);
// wake up receiver if necessary
- smpi_host_data_t remote_host = SIMIX_host_get_data(SIMIX_process_get_host(smpi_global->main_processes[dindex]));
- SIMIX_process_resume(remote_host->receiver);
+ SIMIX_process_resume(remote_process->receiver);
} else if (mydata->finalize>0) { /* main wants me to die and nothing to do */
mydata->finalize--;
} else if (mydata->finalize>0) { /* main wants me to die and nothing to do */
mydata->finalize--;