renamed MPI_ functions to avoid namespace collisions in distributed code.

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

diff --git a/src/smpi/smpi_sender.c b/src/smpi/smpi_sender.c
index f02e0ab..1df105f 100644 (file)
--- a/src/smpi/smpi_sender.c
+++ b/src/smpi/smpi_sender.c
@@ -1,9 +1,12 @@
 #include "private.h"
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_sender, smpi, "Logging specific to SMPI (sender)");
+
 int smpi_sender(int argc, char **argv)
 {
        smx_process_t self;
        smx_host_t shost;
+
        int index;
 
        xbt_fifo_t request_queue;
@@ -15,7 +18,6 @@ int smpi_sender(int argc, char **argv)
 
        smx_host_t dhost;
 
-       char communication[] = "communication";
        smx_action_t action;
 
        smpi_received_message_t message;
@@ -78,10 +80,6 @@ int smpi_sender(int argc, char **argv)
                        message->forward = (request->forward - 1) / 2;
                        request->forward = request->forward / 2;
 
-                       SIMIX_mutex_lock(smpi_global->received_message_queues_mutexes[dindex]);
-                       xbt_fifo_push(smpi_global->received_message_queues[dindex], message);
-                       SIMIX_mutex_unlock(smpi_global->received_message_queues_mutexes[dindex]);
-
                        if (0 < request->forward) {
                                request->dst = (request->dst + message->forward + 1) % request->comm->size;
                                SIMIX_mutex_lock(request_queue_mutex);
@@ -91,14 +89,20 @@ int smpi_sender(int argc, char **argv)
                                request->completed = 1;
                        }
 
-                       action = SIMIX_action_communicate(shost, dhost, communication, request->datatype->size * request->count, -1.0);
+                       action = SIMIX_action_communicate(shost, dhost, "communication", request->datatype->size * request->count, -1.0);
 
                        SIMIX_register_action_to_condition(action, request->cond);
                        SIMIX_cond_wait(request->cond, request->mutex);
+
                        SIMIX_unregister_action_to_condition(action, request->cond);
+                       SIMIX_action_destroy(action);
 
                        SIMIX_mutex_unlock(request->mutex);
 
+                       SIMIX_mutex_lock(smpi_global->received_message_queues_mutexes[dindex]);
+                       xbt_fifo_push(smpi_global->received_message_queues[dindex], message);
+                       SIMIX_mutex_unlock(smpi_global->received_message_queues_mutexes[dindex]);
+
                        // wake up receiver if necessary
                        receiver_process = smpi_global->receiver_processes[dindex];
                        if (SIMIX_process_is_suspended(receiver_process)) {