cosmetics

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

diff --git a/src/smpi/smpi_receiver.c b/src/smpi/smpi_receiver.c
index 9f4771e..4f21418 100644 (file)
--- a/src/smpi/smpi_receiver.c
+++ b/src/smpi/smpi_receiver.c
@@ -20,8 +20,6 @@ int smpi_receiver(int argc, char **argv)
        xbt_fifo_item_t request_item;
        xbt_fifo_item_t message_item;
 
-       e_surf_action_state_t state;
-
        self = SIMIX_process_self();
 
        // make sure root is done before own initialization
@@ -52,8 +50,6 @@ int smpi_receiver(int argc, char **argv)
        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?
 
@@ -68,19 +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);
-                               state   = SIMIX_action_get_state(message->action);
                                if (
                                        request->comm == message->comm &&
                                        (MPI_ANY_SOURCE == request->src || request->src == message->src) &&
-                                       (MPI_ANY_TAG == request->tag || request->tag == message->tag) &&
-                                       (state != SURF_ACTION_READY && state != SURF_ACTION_RUNNING)
-                               ) {
+                                       (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);
@@ -89,8 +88,6 @@ stopsearch:
                        SIMIX_process_suspend(self);
                } else {
 
-                       // FIXME: check action status for bad messages
-
                        SIMIX_mutex_lock(request->mutex);
                        memcpy(request->buf, message->buf, request->datatype->size * request->count);
                        request->src = message->src;