X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6ce3162b34f0a964b8844368b9d86df4f1cf89b..5f7e3ee3f051a31e1568c69456e83f20ff69e69f:/src/smpi/smpi_receiver.c

diff --git a/src/smpi/smpi_receiver.c b/src/smpi/smpi_receiver.c
index f842dd69fd..eb5c887cbf 100644
--- a/src/smpi/smpi_receiver.c
+++ b/src/smpi/smpi_receiver.c
@@ -3,24 +3,22 @@
 int smpi_receiver(int argc, char **argv)
 {
 	smx_process_t self;
-	int rank;
+	int index;
 
 	xbt_fifo_t request_queue;
 	smx_mutex_t request_queue_mutex;
 	xbt_fifo_t message_queue;
 	smx_mutex_t message_queue_mutex;
-	int size;
 
 	int running_hosts_count;
 
-	smpi_mpi_request_t *request;
-	smpi_received_message_t *message;
+	smpi_mpi_request_t request;
+	smpi_received_message_t message;
 
 	xbt_fifo_item_t request_item;
 	xbt_fifo_item_t message_item;
 
-	self  = SIMIX_process_self();
-	rank  = smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world);
+	self = SIMIX_process_self();
 
 	// make sure root is done before own initialization
 	SIMIX_mutex_lock(smpi_global->start_stop_mutex);
@@ -29,18 +27,19 @@ int smpi_receiver(int argc, char **argv)
 	}
 	SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
 
-	request_queue       = smpi_global->pending_recv_request_queues[rank];
-	request_queue_mutex = smpi_global->pending_recv_request_queues_mutexes[rank];
-	message_queue       = smpi_global->received_message_queues[rank];
-	message_queue_mutex = smpi_global->received_message_queues_mutexes[rank];
-	size                = smpi_mpi_comm_size(smpi_mpi_global->mpi_comm_world);
+	index = smpi_host_index();
 
-	smpi_global->receiver_processes[rank] = self;
+	request_queue       = smpi_global->pending_recv_request_queues[index];
+	request_queue_mutex = smpi_global->pending_recv_request_queues_mutexes[index];
+	message_queue       = smpi_global->received_message_queues[index];
+	message_queue_mutex = smpi_global->received_message_queues_mutexes[index];
+
+	smpi_global->receiver_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 * size) {
+	if (smpi_global->ready_process_count < 3 * smpi_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);
@@ -65,8 +64,8 @@ int smpi_receiver(int argc, char **argv)
 				message_item = xbt_fifo_get_next_item(message_item)) {
 				message = xbt_fifo_get_item_content(message_item);
 				if (request->comm == message->comm &&
-						(MPI_ANY_SOURCE == request->src || request->src == message->src) &&
-						request->tag == message->tag) {
+				   (MPI_ANY_SOURCE == request->src || request->src == message->src) &&
+				   (MPI_ANY_TAG == request->tag || request->tag == message->tag)) {
 					xbt_fifo_remove_item(request_queue, request_item);
 					xbt_fifo_remove_item(message_queue, message_item);
 					goto stopsearch;
@@ -80,17 +79,27 @@ stopsearch:
 		if (NULL == request || NULL == message) {
 			SIMIX_process_suspend(self);
 		} else {
-			SIMIX_mutex_lock(request->simdata->mutex);
 
+			SIMIX_mutex_lock(request->mutex);
 			memcpy(request->buf, message->buf, request->datatype->size * request->count);
 			request->src = message->src;
-			request->completed = 1;
-			SIMIX_cond_broadcast(request->simdata->cond);
+			request->data = message->data;
+			request->forward = message->forward;
+
+			if (0 == request->forward) {
+				request->completed = 1;
+				SIMIX_cond_broadcast(request->cond);
+			} else {
+				request->src = smpi_mpi_comm_rank(request->comm);
+				request->dst = (request->src + 1) % request->comm->size;
+				smpi_mpi_isend(request);
+			}
 
-			SIMIX_mutex_unlock(request->simdata->mutex);
+			SIMIX_mutex_unlock(request->mutex);
 
 			xbt_free(message->buf);
 			xbt_mallocator_release(smpi_global->message_mallocator, message);
+
 		}
 
 		SIMIX_mutex_lock(smpi_global->running_hosts_count_mutex);
@@ -99,14 +108,5 @@ stopsearch:
 
 	} 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;
 }