moving smpi.h to public include directory.

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

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 1972895..7f64d5a 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,11 +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_mpi_comm_world_rank_self()
-//{
-//     return smpi_mpi_comm_rank(smpi_mpi_global->mpi_comm_world, SIMIX_host_self());
-//}
-
 int smpi_sender(int argc, char **argv)
 {
        smx_process_t self;
@@ -51,7 +46,7 @@ int smpi_sender(int argc, char **argv)
 
        smx_host_t dhost;
 
-       smx_action_t communicate_action;
+       smx_action_t action;
 
        smpi_received_message_t *message;
 
@@ -96,10 +91,10 @@ int smpi_sender(int argc, char **argv)
                        SIMIX_process_suspend(self);
                } else {
 
-                       SIMIX_mutex_lock(request->mutex);
-
-                       // copy request to appropriate received queue
                        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;
@@ -107,7 +102,7 @@ int smpi_sender(int argc, char **argv)
                        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];
+                       dhost = request->comm->simdata->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]);
@@ -116,19 +111,16 @@ int smpi_sender(int argc, char **argv)
 
                        request->completed = 1;
 
-                       communicate_action = SIMIX_action_communicate(shost, dhost,
-                               NULL, request->datatype->size * request->count * 1.0, -1.0);
+                       action = SIMIX_action_communicate(shost, dhost, NULL, request->datatype->size * request->count * 1.0, -1.0);
 
-                       SIMIX_register_condition_to_action(communicate_action, request->cond);
-                       SIMIX_register_action_to_condition(communicate_action, request->cond);
+                       SIMIX_register_action_to_condition(action, request->simdata->cond);
 
-                       SIMIX_cond_wait(request->cond, request->mutex);
+                       SIMIX_cond_wait(request->simdata->cond, request->simdata->mutex);
 
-                       SIMIX_mutex_unlock(request->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);
                        }
@@ -233,14 +225,14 @@ stopsearch:
                if (NULL == request || NULL == message) {
                        SIMIX_process_suspend(self);
                } else {
-                       SIMIX_mutex_lock(request->mutex);
+                       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->cond);
+                       SIMIX_cond_broadcast(request->simdata->cond);
 
-                       SIMIX_mutex_unlock(request->mutex);
+                       SIMIX_mutex_unlock(request->simdata->mutex);
 
                        xbt_free(message->buf);
                        xbt_mallocator_release(smpi_global->message_mallocator, message);
@@ -269,8 +261,9 @@ void *smpi_request_new()
        smpi_mpi_request_t *request = xbt_new(smpi_mpi_request_t, 1);
 
        request->completed = 0;
-       request->mutex     = SIMIX_mutex_init();
-       request->cond      = SIMIX_cond_init();
+       request->simdata            = xbt_new(s_smpi_mpi_request_simdata_t, 1);
+       request->simdata->mutex     = SIMIX_mutex_init();
+       request->simdata->cond      = SIMIX_cond_init();
 
        return request;
 }
@@ -281,8 +274,9 @@ void smpi_request_free(void *pointer)
        smpi_mpi_request_t *request = pointer;
 
        if (NULL != request) {
-               SIMIX_cond_destroy(request->cond);
-               SIMIX_mutex_destroy(request->mutex);
+               SIMIX_cond_destroy(request->simdata->cond);
+               SIMIX_mutex_destroy(request->simdata->mutex);
+               xbt_free(request->simdata);
                xbt_free(request);
        }
 
@@ -415,6 +409,7 @@ void smpi_global_destroy()
 
 int smpi_run_simulation(int argc, char **argv)
 {
+       xbt_fifo_item_t cond_item   = NULL;
        smx_cond_t   cond           = NULL;
        smx_action_t action         = NULL;
 
@@ -448,15 +443,17 @@ int smpi_run_simulation(int argc, char **argv)
        while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
                while ((action = xbt_fifo_pop(actions_failed))) {
                        DEBUG1("** %s failed **", action->name);
-                       while ((cond = xbt_fifo_pop(action->cond_list))) {
+                       xbt_fifo_foreach(action->cond_list, cond_item, cond, smx_cond_t) {
                                SIMIX_cond_broadcast(cond);
+                               SIMIX_unregister_action_to_condition(action, cond);
                        }
                        SIMIX_action_destroy(action);
                }
                while ((action = xbt_fifo_pop(actions_done))) {
                        DEBUG1("** %s done **",action->name);
-                       while ((cond = xbt_fifo_pop(action->cond_list))) {
+                       xbt_fifo_foreach(action->cond_list, cond_item, cond, smx_cond_t) {
                                SIMIX_cond_broadcast(cond);
+                               SIMIX_unregister_action_to_condition(action, cond);
                        }
                        SIMIX_action_destroy(action);
                }
@@ -508,14 +505,15 @@ void smpi_mpi_init()
                smpi_mpi_global                                = xbt_new(s_SMPI_MPI_Global_t, 1);
 
                // global communicator
-               smpi_mpi_global->mpi_comm_world                = xbt_new(smpi_mpi_communicator_t, 1);
-               smpi_mpi_global->mpi_comm_world->size          = size;
-               smpi_mpi_global->mpi_comm_world->barrier_count = 0;
-               smpi_mpi_global->mpi_comm_world->barrier_mutex = SIMIX_mutex_init();
-               smpi_mpi_global->mpi_comm_world->barrier_cond  = SIMIX_cond_init();
-               smpi_mpi_global->mpi_comm_world->hosts         = hosts;
-               smpi_mpi_global->mpi_comm_world->processes     = xbt_new(smx_process_t, size);
-               smpi_mpi_global->mpi_comm_world->processes[0]  = process;
+               smpi_mpi_global->mpi_comm_world                         = xbt_new(smpi_mpi_communicator_t, 1);
+               smpi_mpi_global->mpi_comm_world->size                   = size;
+               smpi_mpi_global->mpi_comm_world->simdata                = xbt_new(s_smpi_mpi_communicator_simdata_t, 1);
+               smpi_mpi_global->mpi_comm_world->simdata->barrier_count = 0;
+               smpi_mpi_global->mpi_comm_world->simdata->barrier_mutex = SIMIX_mutex_init();
+               smpi_mpi_global->mpi_comm_world->simdata->barrier_cond  = SIMIX_cond_init();
+               smpi_mpi_global->mpi_comm_world->simdata->hosts         = hosts;
+               smpi_mpi_global->mpi_comm_world->simdata->processes     = xbt_new(smx_process_t, size);
+               smpi_mpi_global->mpi_comm_world->simdata->processes[0]  = process;
 
                // mpi datatypes
                smpi_mpi_global->mpi_byte                      = xbt_new(smpi_mpi_datatype_t, 1);
@@ -546,7 +544,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
@@ -593,9 +591,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);
@@ -633,15 +632,15 @@ 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();
 
-       SIMIX_register_condition_to_action(compute_action, cond);
-       SIMIX_register_action_to_condition(compute_action, cond);
        SIMIX_mutex_lock(mutex);
+       SIMIX_register_action_to_condition(compute_action, cond);
        SIMIX_cond_wait(cond, mutex);
+       //SIMIX_unregister_action_to_condition(compute_action, cond);
        SIMIX_mutex_unlock(mutex);
 
        SIMIX_mutex_destroy(mutex);
@@ -655,14 +654,14 @@ void smpi_bench_end()
 void smpi_barrier(smpi_mpi_communicator_t *comm)
 {
 
-       SIMIX_mutex_lock(comm->barrier_mutex);
-       if(++comm->barrier_count < comm->size) {
-               SIMIX_cond_wait(comm->barrier_cond, comm->barrier_mutex);
+       SIMIX_mutex_lock(comm->simdata->barrier_mutex);
+       if(++comm->simdata->barrier_count < comm->size) {
+               SIMIX_cond_wait(comm->simdata->barrier_cond, comm->simdata->barrier_mutex);
        } else {
-               comm->barrier_count = 0;
-               SIMIX_cond_broadcast(comm->barrier_cond);
+               comm->simdata->barrier_count = 0;
+               SIMIX_cond_broadcast(comm->simdata->barrier_cond);
        }
-       SIMIX_mutex_unlock(comm->barrier_mutex);
+       SIMIX_mutex_unlock(comm->simdata->barrier_mutex);
 
        return;
 }
@@ -671,7 +670,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;
 }
@@ -749,14 +748,14 @@ int smpi_irecv(smpi_mpi_request_t *request)
 void smpi_wait(smpi_mpi_request_t *request, smpi_mpi_status_t *status)
 {
        if (NULL != request) {
-               SIMIX_mutex_lock(request->mutex);
+               SIMIX_mutex_lock(request->simdata->mutex);
                if (!request->completed) {
-                       SIMIX_cond_wait(request->cond, request->mutex);
+                       SIMIX_cond_wait(request->simdata->cond, request->simdata->mutex);
                }
                if (NULL != status) {
                        status->MPI_SOURCE = request->src;
                }
-               SIMIX_mutex_unlock(request->mutex);
+               SIMIX_mutex_unlock(request->simdata->mutex);
        }
 }
 
@@ -790,10 +789,10 @@ unsigned int smpi_sleep(unsigned int seconds)
        mutex        = SIMIX_mutex_init();
        cond         = SIMIX_cond_init();
 
-       SIMIX_register_condition_to_action(sleep_action, cond);
-       SIMIX_register_action_to_condition(sleep_action, cond);
        SIMIX_mutex_lock(mutex);
+       SIMIX_register_action_to_condition(sleep_action, cond);
        SIMIX_cond_wait(cond, mutex);
+       //SIMIX_unregister_action_to_condition(sleep_action, cond);
        SIMIX_mutex_unlock(mutex);
 
        SIMIX_mutex_destroy(mutex);