cleaned up action code to destroy completed actions. This fixes a timing bug.

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 0d069d0..aeec12f 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -12,9 +12,12 @@ void *smpi_request_new()
 {
        smpi_mpi_request_t request = xbt_new(s_smpi_mpi_request_t, 1);
 
+       request->buf       = NULL;
        request->completed = 0;
        request->mutex     = SIMIX_mutex_init();
        request->cond      = SIMIX_cond_init();
+       request->data      = NULL;
+       request->forward   = 0;
 
        return request;
 }
@@ -26,11 +29,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);
-               xbt_free(request);
-       }
+       SIMIX_cond_destroy(request->cond);
+       SIMIX_mutex_destroy(request->mutex);
+       xbt_free(request);
 
        return;
 }
@@ -41,7 +42,10 @@ void smpi_request_reset(void *pointer)
 {
        smpi_mpi_request_t request = pointer;
 
+       request->buf       = NULL;
        request->completed = 0;
+       request->data      = NULL;
+       request->forward   = 0;
 
        return;
 }
@@ -51,17 +55,16 @@ void *smpi_message_new(void);
 
 void *smpi_message_new()
 {
-       return xbt_new(s_smpi_received_message_t, 1);
+       smpi_received_message_t message = xbt_new(s_smpi_received_message_t, 1);
+       message->buf = NULL;
+       return message;
 }
 
 void smpi_message_free(void *pointer);
 
 void smpi_message_free(void *pointer)
 {
-       if (NULL != pointer) {
-               xbt_free(pointer);
-       }
-
+       xbt_free(pointer);
        return;
 }
 
@@ -69,6 +72,8 @@ void smpi_message_reset(void *pointer);
 
 void smpi_message_reset(void *pointer)
 {
+       smpi_received_message_t message = pointer;
+       message->buf = NULL;
        return;
 }
 
@@ -79,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) {
@@ -95,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;
@@ -157,18 +162,23 @@ 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();
+       smpi_global->times_max                           = 0;
+       smpi_global->times_mutex                         = SIMIX_mutex_init();
 
-       for(i = 0; i < size; i++) {
+       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;
        }
 
 }
@@ -194,6 +204,11 @@ 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);
+
        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]);
@@ -201,8 +216,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);
@@ -211,26 +224,21 @@ 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);
 
        smpi_global = NULL;
 }
 
-// FIXME: smarter algorithm?
 int smpi_host_index()
 {
-       int i;
        smx_host_t host = SIMIX_host_self();
+       smpi_host_data_t hdata = (smpi_host_data_t)SIMIX_host_get_data(host);
 
-       for(i = smpi_global->host_count - 1; i > 0 && host != smpi_global->hosts[i]; i--);
-
-       return i;
+       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;
@@ -242,7 +250,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);