refactoring smpi into multiple source files.

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

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 84d9ff2..c659072 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -20,7 +20,7 @@ int smpi_mpi_comm_rank(smpi_mpi_communicator_t *comm, smx_host_t host)
 {
        int i;
 
-       for(i = comm->size - 1; i > 0 && host != comm->hosts[i]; i--);
+       for(i = comm->size - 1; i > 0 && host != comm->simdata->hosts[i]; i--);
 
        return i;
 }
@@ -30,232 +30,6 @@ int inline smpi_mpi_comm_rank_self(smpi_mpi_communicator_t *comm)
        return smpi_mpi_comm_rank(comm, SIMIX_host_self());
 }
 
-int smpi_sender(int argc, char **argv)
-{
-       smx_process_t self;
-       smx_host_t shost;
-       int rank;
-
-       xbt_fifo_t request_queue;
-       smx_mutex_t request_queue_mutex;
-       int size;
-
-       int running_hosts_count;
-
-       smpi_mpi_request_t *request;
-
-       smx_host_t dhost;
-
-       smx_action_t action;
-
-       smpi_received_message_t *message;
-
-       int drank;
-
-       smx_process_t receiver_process;
-
-       self  = SIMIX_process_self();
-       shost = SIMIX_host_self();
-       rank  = smpi_mpi_comm_rank(smpi_mpi_global->mpi_comm_world, shost);
-
-       // make sure root is done before own initialization
-       SIMIX_mutex_lock(smpi_global->start_stop_mutex);
-       if (!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);
-
-       request_queue       = smpi_global->pending_send_request_queues[rank];
-       request_queue_mutex = smpi_global->pending_send_request_queues_mutexes[rank];
-       size                = smpi_mpi_comm_size(smpi_mpi_global->mpi_comm_world);
-
-       smpi_global->sender_processes[rank] = self;
-
-       // 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 {
-               SIMIX_cond_broadcast(smpi_global->start_stop_cond);
-       }
-       SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
-
-       do {
-
-               SIMIX_mutex_lock(request_queue_mutex);
-               request = xbt_fifo_shift(request_queue);
-               SIMIX_mutex_unlock(request_queue_mutex);
-
-               if (NULL == request) {
-                       SIMIX_process_suspend(self);
-               } else {
-
-                       message       = xbt_mallocator_get(smpi_global->message_mallocator);
-
-                       SIMIX_mutex_lock(request->simdata->mutex);
-
-                       message->comm = request->comm;
-                       message->src  = request->src;
-                       message->dst  = request->dst;
-                       message->tag  = request->tag;
-                       message->buf  = xbt_malloc(request->datatype->size * request->count);
-                       memcpy(message->buf, request->buf, request->datatype->size * request->count);
-
-                       dhost = request->comm->hosts[request->dst];
-                       drank = smpi_mpi_comm_rank(smpi_mpi_global->mpi_comm_world, dhost);
-
-                       SIMIX_mutex_lock(smpi_global->received_message_queues_mutexes[drank]);
-                       xbt_fifo_push(smpi_global->received_message_queues[drank], message);
-                       SIMIX_mutex_unlock(smpi_global->received_message_queues_mutexes[drank]);
-
-                       request->completed = 1;
-
-                       action = SIMIX_action_communicate(shost, dhost, NULL, request->datatype->size * request->count * 1.0, -1.0);
-
-                       SIMIX_register_action_to_condition(action, request->simdata->cond);
-
-                       SIMIX_cond_wait(request->simdata->cond, request->simdata->mutex);
-
-                       SIMIX_mutex_unlock(request->simdata->mutex);
-
-                       // wake up receiver if necessary
-                       receiver_process = smpi_global->receiver_processes[drank];
-                       if (SIMIX_process_is_suspended(receiver_process)) {
-                               SIMIX_process_resume(receiver_process);
-                       }
-
-               }
-
-               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);
-
-       SIMIX_mutex_lock(smpi_global->start_stop_mutex);
-       smpi_global->ready_process_count--;
-       if (smpi_global->ready_process_count == 0) {
-               SIMIX_cond_broadcast(smpi_global->start_stop_cond);
-       } else if (smpi_global->ready_process_count < 0) {
-               // FIXME: can't happen! abort!
-       }
-       SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
-
-       return 0;
-}
-
-int smpi_receiver(int argc, char **argv)
-{
-       smx_process_t self;
-       int rank;
-
-       xbt_fifo_t request_queue;
-       smx_mutex_t request_queue_mutex;
-       xbt_fifo_t message_queue;
-       smx_mutex_t message_queue_mutex;
-       int size;
-
-       int running_hosts_count;
-
-       smpi_mpi_request_t *request;
-       smpi_received_message_t *message;
-
-       xbt_fifo_item_t request_item;
-       xbt_fifo_item_t message_item;
-
-       self  = SIMIX_process_self();
-       rank  = smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world);
-
-       // make sure root is done before own initialization
-       SIMIX_mutex_lock(smpi_global->start_stop_mutex);
-       if (!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);
-
-       request_queue       = smpi_global->pending_recv_request_queues[rank];
-       request_queue_mutex = smpi_global->pending_recv_request_queues_mutexes[rank];
-       message_queue       = smpi_global->received_message_queues[rank];
-       message_queue_mutex = smpi_global->received_message_queues_mutexes[rank];
-       size                = smpi_mpi_comm_size(smpi_mpi_global->mpi_comm_world);
-
-       smpi_global->receiver_processes[rank] = self;
-
-       // 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 {
-               SIMIX_cond_broadcast(smpi_global->start_stop_cond);
-       }
-       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?
-
-               // 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);
-                               if (request->comm == message->comm &&
-                                               (MPI_ANY_SOURCE == request->src || request->src == message->src) &&
-                                               request->tag == message->tag) {
-                                       xbt_fifo_remove_item(request_queue, request_item);
-                                       xbt_fifo_remove_item(message_queue, message_item);
-                                       goto stopsearch;
-                               }
-                       }
-               }
-stopsearch:
-               SIMIX_mutex_unlock(message_queue_mutex);
-               SIMIX_mutex_unlock(request_queue_mutex);
-
-               if (NULL == request || NULL == message) {
-                       SIMIX_process_suspend(self);
-               } else {
-                       SIMIX_mutex_lock(request->simdata->mutex);
-
-                       memcpy(request->buf, message->buf, request->datatype->size * request->count);
-                       request->src = message->src;
-                       request->completed = 1;
-                       SIMIX_cond_broadcast(request->simdata->cond);
-
-                       SIMIX_mutex_unlock(request->simdata->mutex);
-
-                       xbt_free(message->buf);
-                       xbt_mallocator_release(smpi_global->message_mallocator, message);
-               }
-
-               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);
-
-       SIMIX_mutex_lock(smpi_global->start_stop_mutex);
-       smpi_global->ready_process_count--;
-       if (smpi_global->ready_process_count == 0) {
-               SIMIX_cond_broadcast(smpi_global->start_stop_cond);
-       } else if (smpi_global->ready_process_count < 0) {
-               // FIXME: can't happen, abort!
-       }
-       SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
-
-       return 0;
-}
-
 void *smpi_request_new()
 {
        smpi_mpi_request_t *request = xbt_new(smpi_mpi_request_t, 1);
@@ -544,7 +318,7 @@ void smpi_mpi_init()
                }
                SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
 
-               smpi_mpi_global->mpi_comm_world->processes[smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world)] = process;
+               smpi_mpi_global->mpi_comm_world->simdata->processes[smpi_mpi_comm_rank_self(smpi_mpi_global->mpi_comm_world)] = process;
        }
 
        // wait for all nodes to signal initializatin complete
@@ -591,9 +365,10 @@ void smpi_mpi_finalize()
                }
                SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
 
-               SIMIX_mutex_destroy(smpi_mpi_global->mpi_comm_world->barrier_mutex);
-               SIMIX_cond_destroy(smpi_mpi_global->mpi_comm_world->barrier_cond);
-               xbt_free(smpi_mpi_global->mpi_comm_world->processes);
+               SIMIX_mutex_destroy(smpi_mpi_global->mpi_comm_world->simdata->barrier_mutex);
+               SIMIX_cond_destroy(smpi_mpi_global->mpi_comm_world->simdata->barrier_cond);
+               xbt_free(smpi_mpi_global->mpi_comm_world->simdata->processes);
+               xbt_free(smpi_mpi_global->mpi_comm_world->simdata);
                xbt_free(smpi_mpi_global->mpi_comm_world);
 
                xbt_free(smpi_mpi_global->mpi_byte);
@@ -631,7 +406,7 @@ void smpi_bench_end()
        duration       = xbt_os_timer_elapsed(smpi_global->timers[rank]);
        SIMIX_mutex_unlock(smpi_global->timers_mutexes[rank]);
 
-       host           = smpi_mpi_global->mpi_comm_world->hosts[rank];
+       host           = smpi_mpi_global->mpi_comm_world->simdata->hosts[rank];
        compute_action = SIMIX_action_execute(host, NULL, duration * SMPI_DEFAULT_SPEED);
        mutex          = SIMIX_mutex_init();
        cond           = SIMIX_cond_init();
@@ -669,7 +444,7 @@ void smpi_barrier(smpi_mpi_communicator_t *comm)
 int smpi_comm_rank(smpi_mpi_communicator_t *comm, smx_host_t host)
 {
        int i;
-       for(i = 0; i < comm->size && host != comm->hosts[i]; i++);
+       for(i = 0; i < comm->size && host != comm->simdata->hosts[i]; i++);
        if (i >= comm->size) i = -1;
        return i;
 }