Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
added code to allow for DO_ONCE loops. very preliminary.
[simgrid.git] / src / smpi / smpi_global.c
index 4aef5a2..af72607 100644 (file)
 #include <stdio.h>
+
 #include "private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi,XBT_LOG_ROOT_CAT, "All SMPI categories (see \ref SMPI_API)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi, XBT_LOG_ROOT_CAT, "All SMPI categories");
+
+smpi_global_t     smpi_global     = NULL;
 
-SMPI_Global_t     smpi_global     = NULL;
+void *smpi_request_new(void);
 
 void *smpi_request_new()
 {
-       smpi_mpi_request_t *request = xbt_new(smpi_mpi_request_t, 1);
+       smpi_mpi_request_t request = xbt_new(s_smpi_mpi_request_t, 1);
 
+       request->buf       = NULL;
        request->completed = 0;
-       request->simdata            = xbt_new(s_smpi_mpi_request_simdata_t, 1);
-       request->simdata->mutex     = SIMIX_mutex_init();
-       request->simdata->cond      = SIMIX_cond_init();
+       request->mutex     = SIMIX_mutex_init();
+       request->cond      = SIMIX_cond_init();
+       request->data      = NULL;
+       request->forward   = 0;
 
        return request;
 }
 
+void smpi_request_free(void *pointer);
+
 void smpi_request_free(void *pointer)
 {
 
-       smpi_mpi_request_t *request = pointer;
+       smpi_mpi_request_t request = pointer;
 
-       if (NULL != request) {
-               SIMIX_cond_destroy(request->simdata->cond);
-               SIMIX_mutex_destroy(request->simdata->mutex);
-               xbt_free(request->simdata);
-               xbt_free(request);
-       }
+       SIMIX_cond_destroy(request->cond);
+       SIMIX_mutex_destroy(request->mutex);
+       xbt_free(request);
 
        return;
 }
 
+void smpi_request_reset(void *pointer);
+
 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;
 }
 
 
+void *smpi_message_new(void);
+
 void *smpi_message_new()
 {
-       return xbt_new(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;
 }
 
+void smpi_message_reset(void *pointer);
+
 void smpi_message_reset(void *pointer)
 {
+       smpi_received_message_t message = pointer;
+       message->buf = NULL;
        return;
 }
 
+int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
+       int src, int dst, int tag, smpi_mpi_communicator_t comm, smpi_mpi_request_t *requestptr)
+{
+       int retval = MPI_SUCCESS;
+
+       smpi_mpi_request_t request = 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) {
+               retval = MPI_ERR_COUNT;
+       } else if (NULL == datatype) {
+               retval = MPI_ERR_TYPE;
+       } else if (MPI_ANY_SOURCE != src && (0 > src || comm->size <= src)) {
+               retval = MPI_ERR_RANK;
+       } else if (0 > dst || comm->size <= dst) {
+               retval = MPI_ERR_RANK;
+       } else if (MPI_ANY_TAG != tag && 0 > tag) {
+               retval = MPI_ERR_TAG;
+       } else if (NULL == comm) {
+               retval = MPI_ERR_COMM;
+       } else if (NULL == requestptr) {
+               retval = MPI_ERR_ARG;
+       } else {
+               request           = xbt_mallocator_get(smpi_global->request_mallocator);
+               request->comm     = comm;
+               request->src      = src;
+               request->dst      = dst;
+               request->tag      = tag;
+               request->buf      = buf;
+               request->datatype = datatype;
+               request->count    = count;
+
+               *requestptr       = request;
+       }
+       return retval;
+}
+
 void smpi_global_init()
 {
        int i;
 
        int size = SIMIX_host_get_number();
 
-       smpi_global = xbt_new(s_SMPI_Global_t, 1);
+       smpi_global                                      = xbt_new(s_smpi_global_t, 1);
 
        // config variable
        smpi_global->reference_speed                     = SMPI_DEFAULT_SPEED;
@@ -75,9 +134,10 @@ void smpi_global_init()
        smpi_global->start_stop_mutex                    = SIMIX_mutex_init();
        smpi_global->start_stop_cond                     = SIMIX_cond_init();
 
-       // processes
-       smpi_global->sender_processes                    = xbt_new(smx_process_t, size);
-       smpi_global->receiver_processes                  = xbt_new(smx_process_t, size);
+       // host info blank until sim starts
+       // FIXME: is this okay?
+       smpi_global->hosts                               = NULL;
+       smpi_global->host_count                          = 0;
 
        // running hosts
        smpi_global->running_hosts_count_mutex           = SIMIX_mutex_init();
@@ -97,19 +157,28 @@ void smpi_global_init()
        smpi_global->received_message_queues             = xbt_new(xbt_fifo_t,  size);
        smpi_global->received_message_queues_mutexes     = xbt_new(smx_mutex_t, size);
 
+       // sender/receiver processes
+       smpi_global->sender_processes                    = xbt_new(smx_process_t, size);
+       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;
        }
 
 }
@@ -135,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]);
@@ -142,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);
@@ -152,10 +224,18 @@ 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;
+}
+
+int smpi_host_index()
+{
+       smx_host_t host = SIMIX_host_self();
+       smpi_host_data_t hdata = (smpi_host_data_t)SIMIX_host_get_data(host);
+
+       return hdata->index;
 }
 
 int smpi_run_simulation(int argc, char **argv)