cosmetics (use xbt_fifo_foreach where relevant)

[simgrid.git] / src / smpi / smpi_receiver.c

diff --git a/src/smpi/smpi_receiver.c b/src/smpi/smpi_receiver.c
index 0f56f84..a8eeea9 100644 (file)
--- a/src/smpi/smpi_receiver.c
+++ b/src/smpi/smpi_receiver.c
@@ -9,9 +9,7 @@ int smpi_receiver(int argc, char **argv)
   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 running_hosts_count;
 
@@ -26,10 +24,7 @@ int smpi_receiver(int argc, char **argv)
   index = smpi_host_index();
 
   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;
 
@@ -37,17 +32,9 @@ int smpi_receiver(int argc, char **argv)
 
     // FIXME: better algorithm, maybe some kind of balanced tree? or a heap?
 
-    // FIXME: not the best way to request multiple locks...
-    SIMIX_mutex_lock(request_queue_mutex);
-    SIMIX_mutex_lock(message_queue_mutex);
-    for (request_item = xbt_fifo_get_first_item(request_queue);
-         NULL != request_item;
-         request_item = xbt_fifo_get_next_item(request_item)) {
-      request = xbt_fifo_get_item_content(request_item);
-      for (message_item = xbt_fifo_get_first_item(message_queue);
-           NULL != message_item;
-           message_item = xbt_fifo_get_next_item(message_item)) {
-        message = xbt_fifo_get_item_content(message_item);
+       xbt_fifo_foreach(request_queue,request_item,request,smpi_mpi_request_t){
+         xbt_fifo_foreach(message_queue,message_item,message, smpi_received_message_t) {
+
         if (request->comm == message->comm &&
             (MPI_ANY_SOURCE == request->src || request->src == message->src)
             && (MPI_ANY_TAG == request->tag || request->tag == message->tag)) {
@@ -64,9 +51,6 @@ int smpi_receiver(int argc, char **argv)
     message = NULL;
 
   stopsearch:
-    SIMIX_mutex_unlock(message_queue_mutex);
-    SIMIX_mutex_unlock(request_queue_mutex);
-
     if (NULL == request || NULL == message) {
       SIMIX_process_suspend(self);
     } else {
@@ -94,9 +78,7 @@ int smpi_receiver(int argc, char **argv)
 
     }
 
-    SIMIX_mutex_lock(smpi_global->running_hosts_count_mutex);
     running_hosts_count = smpi_global->running_hosts_count;
-    SIMIX_mutex_unlock(smpi_global->running_hosts_count_mutex);
 
   } while (0 < running_hosts_count);