cleaning up and refactoring some of the code to create execution actions.

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 89771f5..08d693c 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -84,7 +84,7 @@ int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
 
        smpi_mpi_request_t request = NULL;
 
-       // FIXME: make sure requestptr is not null
+       // parameter checking prob belongs in smpi_mpi, but this is less repeat code
        if (NULL == buf) {
                retval = MPI_ERR_INTERN;
        } else if (0 > count) {
@@ -100,7 +100,7 @@ int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
        } else if (NULL == comm) {
                retval = MPI_ERR_COMM;
        } else if (NULL == requestptr) {
-               retval = MPI_ERR_INTERN;
+               retval = MPI_ERR_ARG;
        } else {
                request           = xbt_mallocator_get(smpi_global->request_mallocator);
                request->comm     = comm;
@@ -162,18 +162,27 @@ void smpi_global_init()
        smpi_global->receiver_processes                  = xbt_new(smx_process_t, size);
 
        // timers
-       smpi_global->timers                              = xbt_new(xbt_os_timer_t, size);
-       smpi_global->timers_mutexes                      = xbt_new(smx_mutex_t, size);
+       smpi_global->timer                               = xbt_os_timer_new();
+       smpi_global->timer_mutex                         = SIMIX_mutex_init();
+       smpi_global->timer_cond                          = SIMIX_cond_init();
 
-       for(i = 0; i < size; i++) {
+       smpi_global->times_max                           = 0;
+       smpi_global->times_mutex                         = SIMIX_mutex_init();
+
+       smpi_global->execute_mutex                       = SIMIX_mutex_init();
+       smpi_global->execute_cond                        = SIMIX_cond_init();
+
+       for (i = 0; i < size; i++) {
                smpi_global->pending_send_request_queues[i]         = xbt_fifo_new();
                smpi_global->pending_send_request_queues_mutexes[i] = SIMIX_mutex_init();
                smpi_global->pending_recv_request_queues[i]         = xbt_fifo_new();
                smpi_global->pending_recv_request_queues_mutexes[i] = SIMIX_mutex_init();
                smpi_global->received_message_queues[i]             = xbt_fifo_new();
                smpi_global->received_message_queues_mutexes[i]     = SIMIX_mutex_init();
-               smpi_global->timers[i]                              = xbt_os_timer_new();
-               smpi_global->timers_mutexes[i]                      = SIMIX_mutex_init();
+       }
+
+       for (i = 0; i < SMPI_MAX_TIMES; i++) {
+               smpi_global->times[i] = -1.0;
        }
 
 }
@@ -199,6 +208,13 @@ void smpi_global_destroy()
        xbt_mallocator_free(smpi_global->request_mallocator);
        xbt_mallocator_free(smpi_global->message_mallocator);
 
+       xbt_os_timer_free(smpi_global->timer);
+       SIMIX_mutex_destroy(smpi_global->timer_mutex);
+       SIMIX_cond_destroy(smpi_global->timer_cond);
+       SIMIX_mutex_destroy(smpi_global->times_mutex);
+       SIMIX_mutex_destroy(smpi_global->execute_mutex);
+       SIMIX_cond_destroy(smpi_global->execute_cond);
+
        for(i = 0; i < size; i++) {
                xbt_fifo_free(smpi_global->pending_send_request_queues[i]);
                SIMIX_mutex_destroy(smpi_global->pending_send_request_queues_mutexes[i]);
@@ -206,8 +222,6 @@ void smpi_global_destroy()
                SIMIX_mutex_destroy(smpi_global->pending_recv_request_queues_mutexes[i]);
                xbt_fifo_free(smpi_global->received_message_queues[i]);
                SIMIX_mutex_destroy(smpi_global->received_message_queues_mutexes[i]);
-               xbt_os_timer_free(smpi_global->timers[i]);
-               SIMIX_mutex_destroy(smpi_global->timers_mutexes[i]);
        }
 
        xbt_free(smpi_global->pending_send_request_queues);
@@ -216,8 +230,6 @@ void smpi_global_destroy()
        xbt_free(smpi_global->pending_recv_request_queues_mutexes);
        xbt_free(smpi_global->received_message_queues);
        xbt_free(smpi_global->received_message_queues_mutexes);
-       xbt_free(smpi_global->timers);
-       xbt_free(smpi_global->timers_mutexes);
 
        xbt_free(smpi_global);
 
@@ -232,7 +244,7 @@ int smpi_host_index()
        return hdata->index;
 }
 
-int smpi_run_simulation(int argc, char **argv)
+int smpi_run_simulation(int *argc, char **argv)
 {
        xbt_fifo_item_t cond_item   = NULL;
        smx_cond_t   cond           = NULL;
@@ -244,7 +256,7 @@ int smpi_run_simulation(int argc, char **argv)
 
        srand(SMPI_RAND_SEED);
 
-       SIMIX_global_init(&argc, argv);
+       SIMIX_global_init(argc, argv);
 
        SIMIX_function_register("smpi_simulated_main", smpi_simulated_main);
        SIMIX_function_register("smpi_sender",         smpi_sender);