added proper use of mutex to smpi_wait. smpi_receiver still needs appropriate

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

diff --git a/src/smpi/src/smpi_base.c b/src/smpi/src/smpi_base.c
index 0150470..91733c2 100644 (file)
--- a/src/smpi/src/smpi_base.c
+++ b/src/smpi/src/smpi_base.c
@@ -7,6 +7,8 @@
 #include "simix/private.h"
 #include "smpi.h"
 
+// FIXME: move globals into structure...
+
 xbt_mallocator_t smpi_request_mallocator    = NULL;
 xbt_fifo_t *smpi_pending_send_requests      = NULL;
 xbt_fifo_t *smpi_pending_recv_requests      = NULL;
@@ -48,6 +50,7 @@ int inline smpi_mpi_comm_size(smpi_mpi_communicator_t *comm)
        return comm->size;
 }
 
+// FIXME: smarter algorithm?
 int smpi_mpi_comm_rank(smpi_mpi_communicator_t *comm, smx_host_t host)
 {
        int i;
@@ -62,22 +65,30 @@ int inline smpi_mpi_comm_rank_self(smpi_mpi_communicator_t *comm)
        return smpi_mpi_comm_rank(comm, SIMIX_host_self());
 }
 
+int inline smpi_mpi_comm_world_rank_self()
+{
+       return smpi_mpi_comm_rank(&smpi_mpi_comm_world, SIMIX_host_self())
+}
+
+// FIXME: messages are actually smaller than requests, use them instead?
 int smpi_sender(int argc, char **argv)
 {
+       smx_process_t self;
+       smx_host_t shost;
        int rank;
+       xbt_fifo_t request_queue;
        int size;
        int running_hosts = 0;
        smpi_mpi_request_t *request;
-       smx_process_t self;
-       smx_host_t shost, dhost;
+       smx_host_t dhost;
        smx_action_t communicate_action;
        smpi_mpi_request_t *scratch;
        int drank;
+       smx_process_t waitproc;
 
-       self = SIMIX_process_self();
+       self  = SIMIX_process_self();
        shost = SIMIX_host_self();
-
-       rank = smpi_mpi_comm_rank(&smpi_mpi_comm_world, shost);
+       rank  = smpi_mpi_comm_rank(&smpi_mpi_comm_world, shost);
 
        // make sure root is done before own initialization
        SIMIX_mutex_lock(init_mutex);
@@ -86,6 +97,7 @@ int smpi_sender(int argc, char **argv)
        }
        SIMIX_mutex_unlock(init_mutex);
 
+       request_queue = smpi_pending_send_requests[rank];
        size = smpi_mpi_comm_size(&smpi_mpi_comm_world);
        smpi_sender_processes[rank] = self;
 
@@ -105,7 +117,8 @@ int smpi_sender(int argc, char **argv)
 
        while (0 < running_hosts) {
 
-               request = xbt_fifo_shift(smpi_pending_send_requests[rank]);
+               // FIXME: mutex?
+               request = xbt_fifo_shift(request_queue);
 
                if (NULL == request) {
                        SIMIX_process_suspend(self);
@@ -126,11 +139,17 @@ int smpi_sender(int argc, char **argv)
                        // copy request to appropriate received queue
                        scratch = xbt_mallocator_get(smpi_request_mallocator);
                        memcpy(scratch, request, sizeof smpi_mpi_request_t);
-                       drank = smpi_mpi_comm_rank(MPI_COMM_WORLD, dhost);
+                       drank = smpi_mpi_comm_rank(&smpi_mpi_comm_world, dhost);
                        xbt_fifo_push(smpi_received_messages[drank], scratch);
 
                        request->completed = 1;
 
+                       while(waitproc = xbt_fifo_shift(request->waitlist)) {
+                               if (SIMIX_process_is_suspended(waitproc)) {
+                                       SIMIX_process_resume(waitproc);
+                               }
+                       }
+
                        SIMIX_mutex_unlock(request->mutex);
                }
 
@@ -144,15 +163,18 @@ int smpi_sender(int argc, char **argv)
 
 int smpi_receiver(int argc, char **argv)
 {
-       smx_host_t dhost;
-       int rank;
        smx_process_t self;
+       int rank;
+       xbt_fifo_t request_queue;
+       xbt_fifo_t message_queue;
        int size;
        int running_hosts;
+       smpi_mpi_request_t *message;
+       smpi_mpi_request_t *request;
+       smx_process_t waitproc;
 
-       dhost = SIMIX_host_self();
-       rank = smpi_mpi_comm_rank(&smpi_mpi_comm_world, dhost);
-       self = SIMIX_process_self();
+       self  = SIMIX_process_self();
+       rank  = smpi_mpi_comm_world_rank_self();
 
        // make sure root is done before own initialization
        SIMIX_mutex_lock(init_mutex);
@@ -161,8 +183,10 @@ int smpi_receiver(int argc, char **argv)
        }
        SIMIX_mutex_unlock(init_mutex);
 
+       request_queue = smpi_pending_receive_requests[rank];
+       message_queue = smpi_received_messages[rank];
        size = smpi_mpi_comm_size(&smpi_mpi_comm_world);
-       smpi_receiver_processes[rank] = SIMIX_process_self();
+       smpi_receiver_processes[rank] = self;
 
        // wait for all nodes to signal initializatin complete
        SIMIX_mutex_lock(init_mutex);
@@ -180,12 +204,24 @@ int smpi_receiver(int argc, char **argv)
 
        while (0 < running_hosts) {
 
-               request = xbt_fifo_shift(smpi_pending_send_requests[rank]);
+               // FIXME: search for received messages and requests
 
                if (NULL == request) {
                        SIMIX_process_suspend(self);
                } else {
                        SIMIX_mutex_lock(request->mutex);
+                       memcpy(request->buf, message->buf, request->count * request->type->size);
+                       request->src = message->src;
+                       reqeust->completed = 1;
+
+                       while (waitproc = xbt_fifo_shift(request->waitlist)) {
+                               if (SIMIX_process_is_suspended(waitproc)) {
+                                       SIMIX_process_resume(waitproc);
+                               }
+                       }
+
+                       SIMIX_mutex_unlock(request->mutex);
+                       xbt_mallocator_release(smpi_request_mallocator, message);
                }
 
                SIMIX_mutex_lock(smpi_running_hosts_mutex);
@@ -502,14 +538,23 @@ int smpi_irecv(smpi_mpi_request_t *request)
 void smpi_wait(smpi_mpi_request_t *request, smpi_mpi_status_t *status)
 {
        smx_process_t self;
+       int suspend = 0;
+       self = SIMIX_process_self();
 
        if (NULL != request) {
+               SIMIX_mutex_lock(request->mutex);
                if (!request->completed) {
-                       self = SIMIX_process_self();
                        xbt_fifo_push(request->waitlist, self);
-               }       SIMIX_suspend(self);
+                       suspend = 1;
+               }
+               SIMIX_mutex_unlock(request->mutex);
+               if (suspend) {
+                       SIMIX_suspend(self);
+               }
                if (NULL != status && MPI_STATUS_IGNORE != status) {
+                       SIMIX_mutex_lock(request->mutex);
                        status->MPI_SOURCE = request->src;
+                       SIMIX_mutex_unlock(request->mutex);
                }
        }
 }