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

diff --git a/src/smpi/smpi_receiver.c b/src/smpi/smpi_receiver.c
index 4c046f0d9a..4f214184c0 100644
--- a/src/smpi/smpi_receiver.c
+++ b/src/smpi/smpi_receiver.c
@@ -1,5 +1,7 @@
 #include "private.h"
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_receiver, smpi, "Logging specific to SMPI (receiver)");
+
 int smpi_receiver(int argc, char **argv)
 {
 	smx_process_t self;
@@ -9,8 +11,6 @@ int smpi_receiver(int argc, char **argv)
 	smx_mutex_t request_queue_mutex;
 	xbt_fifo_t message_queue;
 	smx_mutex_t message_queue_mutex;
-	// FIXME: remove?  also sender
-	int size;
 
 	int running_hosts_count;
 
@@ -24,13 +24,12 @@ int smpi_receiver(int argc, char **argv)
 
 	// make sure root is done before own initialization
 	SIMIX_mutex_lock(smpi_global->start_stop_mutex);
-	if (!smpi_global->root_ready) {
+	while (!smpi_global->root_ready) {
 		SIMIX_cond_wait(smpi_global->start_stop_cond, smpi_global->start_stop_mutex);
 	}
 	SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
 
 	index = smpi_host_index();
-	size  = smpi_global->host_count;
 
 	request_queue       = smpi_global->pending_recv_request_queues[index];
 	request_queue_mutex = smpi_global->pending_recv_request_queues_mutexes[index];
@@ -42,16 +41,15 @@ int smpi_receiver(int argc, char **argv)
 	// 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) {
-		SIMIX_cond_wait(smpi_global->start_stop_cond, smpi_global->start_stop_mutex);
-	} else {
+	if (smpi_global->ready_process_count >= 3 * smpi_global->host_count) {
 		SIMIX_cond_broadcast(smpi_global->start_stop_cond);
 	}
+	while (smpi_global->ready_process_count < 3 * smpi_global->host_count) {
+		SIMIX_cond_wait(smpi_global->start_stop_cond, smpi_global->start_stop_mutex);
+	}
 	SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
 
 	do {
-		request = NULL;
-		message = NULL;
 
 		// FIXME: better algorithm, maybe some kind of balanced tree? or a heap?
 
@@ -66,15 +64,22 @@ int smpi_receiver(int argc, char **argv)
 				NULL != message_item;
 				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) &&
-				   (MPI_ANY_TAG == request->tag || request->tag == message->tag)) {
+				if (
+					request->comm == message->comm &&
+				   	(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_free_item(request_item);
 					xbt_fifo_remove_item(message_queue, message_item);
+					xbt_fifo_free_item(message_item);
 					goto stopsearch;
 				}
 			}
 		}
+
+		request = NULL;
+		message = NULL;
+
 stopsearch:
 		SIMIX_mutex_unlock(message_queue_mutex);
 		SIMIX_mutex_unlock(request_queue_mutex);
@@ -86,8 +91,18 @@ stopsearch:
 			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->cond);
+			request->data = message->data;
+			request->forward = message->forward;
+
+			if (0 == request->forward) {
+				request->completed = 1;
+				SIMIX_cond_broadcast(request->cond);
+			} else {
+				request->src = request->comm->index_to_rank_map[index];
+				request->dst = (request->src + 1) % request->comm->size;
+				smpi_mpi_isend(request);
+			}
+
 			SIMIX_mutex_unlock(request->mutex);
 
 			xbt_free(message->buf);