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
updated to use branching-tree broadcast instead of for-loop.
[simgrid.git]
/
src
/
smpi
/
smpi_sender.c
diff --git
a/src/smpi/smpi_sender.c
b/src/smpi/smpi_sender.c
index
92db17b
..
983ded8
100644
(file)
--- a/
src/smpi/smpi_sender.c
+++ b/
src/smpi/smpi_sender.c
@@
-4,29
+4,28
@@
int smpi_sender(int argc, char **argv)
{
smx_process_t self;
smx_host_t shost;
- int
rank
;
+ int
index
;
xbt_fifo_t request_queue;
smx_mutex_t request_queue_mutex;
- int size;
int running_hosts_count;
- smpi_mpi_request_t
*
request;
+ smpi_mpi_request_t request;
smx_host_t dhost;
+ char communication[] = "communication";
smx_action_t action;
- smpi_received_message_t
*
message;
+ smpi_received_message_t message;
- int d
rank
;
+ int d
index
;
smx_process_t receiver_process;
self = SIMIX_process_self();
shost = SIMIX_host_self();
- rank = smpi_mpi_comm_rank(smpi_mpi_global->mpi_comm_world, shost);
// make sure root is done before own initialization
SIMIX_mutex_lock(smpi_global->start_stop_mutex);
@@
-35,16
+34,17
@@
int smpi_sender(int argc, char **argv)
}
SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
- request_queue = smpi_global->pending_send_request_queues[rank];
- request_queue_mutex = smpi_global->pending_send_request_queues_mutexes[rank];
- size = smpi_mpi_comm_size(smpi_mpi_global->mpi_comm_world);
+ index = smpi_host_index();
- smpi_global->sender_processes[rank] = self;
+ request_queue = smpi_global->pending_send_request_queues[index];
+ request_queue_mutex = smpi_global->pending_send_request_queues_mutexes[index];
+
+ smpi_global->sender_processes[index] = self;
// wait for all nodes to signal initializatin complete
SIMIX_mutex_lock(smpi_global->start_stop_mutex);
smpi_global->ready_process_count++;
- if (smpi_global->ready_process_count < 3 * s
ize
) {
+ if (smpi_global->ready_process_count < 3 * s
mpi_global->host_count
) {
SIMIX_cond_wait(smpi_global->start_stop_cond, smpi_global->start_stop_mutex);
} else {
SIMIX_cond_broadcast(smpi_global->start_stop_cond);
@@
-61,36
+61,46
@@
int smpi_sender(int argc, char **argv)
SIMIX_process_suspend(self);
} else {
- message = xbt_mallocator_get(smpi_global->message_mallocator);
+ message
= xbt_mallocator_get(smpi_global->message_mallocator);
- SIMIX_mutex_lock(request->
simdata->
mutex);
+ SIMIX_mutex_lock(request->mutex);
- message->comm = request->comm;
- message->src
= request->src
;
- message->
dst = request->dst
;
- message->
tag = request->tag
;
- message->buf = xbt_malloc(request->datatype->size * request->count);
+ message->comm
= request->comm;
+ message->src
= smpi_mpi_comm_rank(request->comm)
;
+ message->
tag = request->tag
;
+ message->
data = request->data
;
+ message->buf
= xbt_malloc(request->datatype->size * request->count);
memcpy(message->buf, request->buf, request->datatype->size * request->count);
- dhost = request->comm->simdata->hosts[request->dst];
- drank = smpi_mpi_comm_rank(smpi_mpi_global->mpi_comm_world, dhost);
+ dindex = request->comm->rank_to_index_map[request->dst];
+ dhost = smpi_global->hosts[dindex];
+
+ message->forward = (request->forward - 1) / 2;
+ request->forward = request->forward / 2;
- SIMIX_mutex_lock(smpi_global->received_message_queues_mutexes[d
rank
]);
- xbt_fifo_push(smpi_global->received_message_queues[d
rank
], message);
- SIMIX_mutex_unlock(smpi_global->received_message_queues_mutexes[d
rank
]);
+ SIMIX_mutex_lock(smpi_global->received_message_queues_mutexes[d
index
]);
+ xbt_fifo_push(smpi_global->received_message_queues[d
index
], message);
+ SIMIX_mutex_unlock(smpi_global->received_message_queues_mutexes[d
index
]);
- request->completed = 1;
+ if (0 < request->forward) {
+ request->dst = (request->dst + message->forward + 1) % request->comm->size;
+ SIMIX_mutex_lock(request_queue_mutex);
+ xbt_fifo_push(request_queue, request);
+ SIMIX_mutex_unlock(request_queue_mutex);
+ } else {
+ request->completed = 1;
+ }
- action = SIMIX_action_communicate(shost, dhost,
"communicate", request->datatype->size * request->count * 1.0
, -1.0);
+ action = SIMIX_action_communicate(shost, dhost,
communication, request->datatype->size * request->count
, -1.0);
- SIMIX_register_action_to_condition(action, request->
simdata->
cond);
- SIMIX_cond_wait(request->
simdata->cond, request->simdata
->mutex);
- SIMIX_unregister_action_to_condition(action, request->
simdata->
cond);
+ SIMIX_register_action_to_condition(action, request->cond);
+ SIMIX_cond_wait(request->
cond, request
->mutex);
+ SIMIX_unregister_action_to_condition(action, request->cond);
- SIMIX_mutex_unlock(request->
simdata->
mutex);
+ SIMIX_mutex_unlock(request->mutex);
// wake up receiver if necessary
- receiver_process = smpi_global->receiver_processes[d
rank
];
+ receiver_process = smpi_global->receiver_processes[d
index
];
if (SIMIX_process_is_suspended(receiver_process)) {
SIMIX_process_resume(receiver_process);
}
@@
-103,15
+113,5
@@
int smpi_sender(int argc, char **argv)
} while (0 < running_hosts_count);
- SIMIX_mutex_lock(smpi_global->start_stop_mutex);
- smpi_global->ready_process_count--;
- if (smpi_global->ready_process_count == 0) {
- SIMIX_cond_broadcast(smpi_global->start_stop_cond);
- } else if (smpi_global->ready_process_count < 0) {
- // FIXME: can't happen! abort!
- }
- SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
-
return 0;
}
-