renamed MPI_ functions to avoid namespace collisions in distributed code.

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

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index 8fdb8a1..ed45302 100644 (file)
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -1,15 +1,15 @@
-// FIXME: remove
-#include <stdio.h>
 #include "private.h"
 
-int MPI_Init(int *argc, char ***argv)
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi, smpi, "Logging specific to SMPI (mpi)");
+
+int SMPI_MPI_Init(int *argc, char ***argv)
 {
        smpi_mpi_init();
        smpi_bench_begin();
        return MPI_SUCCESS;
 }
 
-int MPI_Finalize()
+int SMPI_MPI_Finalize()
 {
        smpi_bench_end();
        smpi_mpi_finalize();
@@ -18,13 +18,13 @@ int MPI_Finalize()
 
 // right now this just exits the current node, should send abort signal to all
 // hosts in the communicator;
-int MPI_Abort(MPI_Comm comm, int errorcode)
+int SMPI_MPI_Abort(MPI_Comm comm, int errorcode)
 {
        smpi_exit(errorcode);
        return 0;
 }
 
-int MPI_Comm_size(MPI_Comm comm, int *size)
+int SMPI_MPI_Comm_size(MPI_Comm comm, int *size)
 {
        int retval = MPI_SUCCESS;
 
@@ -43,7 +43,7 @@ int MPI_Comm_size(MPI_Comm comm, int *size)
        return retval;
 }
 
-int MPI_Comm_rank(MPI_Comm comm, int *rank)
+int SMPI_MPI_Comm_rank(MPI_Comm comm, int *rank)
 {
        int retval = MPI_SUCCESS;
 
@@ -62,7 +62,7 @@ int MPI_Comm_rank(MPI_Comm comm, int *rank)
        return retval;
 }
 
-int MPI_Type_size(MPI_Datatype datatype, size_t *size)
+int SMPI_MPI_Type_size(MPI_Datatype datatype, size_t *size)
 {
        int retval = MPI_SUCCESS;
 
@@ -81,7 +81,7 @@ int MPI_Type_size(MPI_Datatype datatype, size_t *size)
        return retval;
 }
 
-int MPI_Barrier(MPI_Comm comm)
+int SMPI_MPI_Barrier(MPI_Comm comm)
 {
        int retval = MPI_SUCCESS;
 
@@ -98,20 +98,15 @@ int MPI_Barrier(MPI_Comm comm)
        return retval;
 }
 
-int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request *request)
+int SMPI_MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request *request)
 {
        int retval = MPI_SUCCESS;
 
        smpi_bench_end();
 
-       if (NULL == request) {
-               retval = MPI_ERR_ARG;
-       } else {
-               int dst = 0;
-               retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
-               if (NULL != *request && MPI_SUCCESS == retval) {
-                       retval = smpi_mpi_irecv(*request);
-               }
+       retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, request);
+       if (NULL != *request && MPI_SUCCESS == retval) {
+               retval = smpi_mpi_irecv(*request);
        }
 
        smpi_bench_begin();
@@ -119,15 +114,14 @@ int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI
        return retval;
 }
 
-int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
+int SMPI_MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
 {
        int retval = MPI_SUCCESS;
-       int dst = 0;
        smpi_mpi_request_t request;
 
        smpi_bench_end();
 
-       retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, &request);
+       retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, &request);
        if (NULL != request && MPI_SUCCESS == retval) {
                retval = smpi_mpi_irecv(request);
                if (MPI_SUCCESS == retval) {
@@ -141,20 +135,15 @@ int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_
        return retval;
 }
 
-int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request)
+int SMPI_MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request *request)
 {
        int retval = MPI_SUCCESS;
 
        smpi_bench_end();
 
-       if (NULL == request) {
-               retval = MPI_ERR_ARG;
-       } else {
-               int src = 0;
-               retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
-               if (NULL != *request && MPI_SUCCESS == retval) {
-                       retval = smpi_mpi_isend(*request);
-               }
+       retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, request);
+       if (NULL != *request && MPI_SUCCESS == retval) {
+               retval = smpi_mpi_isend(*request);
        }
 
        smpi_bench_begin();
@@ -162,15 +151,14 @@ int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI
        return retval;
 }
 
-int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
+int SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
 {
        int retval = MPI_SUCCESS;
-       int src = 0;
        smpi_mpi_request_t request;
 
        smpi_bench_end();
 
-       retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, &request);
+       retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, &request);
        if (NULL != request && MPI_SUCCESS == retval) {
                retval = smpi_mpi_isend(request);
                if (MPI_SUCCESS == retval) {
@@ -184,36 +172,28 @@ int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_
        return retval;
 }
 
-// FIXME: overly simplistic
-int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
+int SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
 
        int retval = MPI_SUCCESS;
        int rank;
+       smpi_mpi_request_t request;
 
        smpi_bench_end();
 
        rank = smpi_mpi_comm_rank(comm);
 
        if (rank == root) {
-               int i;
-               smpi_mpi_request_t *requests = xbt_new(smpi_mpi_request_t, comm->size - 1);
-               for (i = 1; i < comm->size; i++) {
-                       retval = smpi_create_request(buf, count, datatype, root, (root + i) % comm->size, 0, comm, requests + i - 1);
-                       smpi_mpi_isend(requests[i - 1]);
-               }
-               for (i = 0; i < comm->size - 1; i++) {
-                       smpi_mpi_wait(requests[i], MPI_STATUS_IGNORE);
-                       xbt_mallocator_release(smpi_global->request_mallocator, requests[i]);
-               }
-               xbt_free(requests);
+               retval = smpi_create_request(buf, count, datatype, root, (root + 1) % comm->size, 0, comm, &request);
+               request->forward = comm->size - 1;
+               smpi_mpi_isend(request);
        } else {
-               smpi_mpi_request_t request;
-               retval = smpi_create_request(buf, count, datatype, root, rank, 0, comm, &request);
+               retval = smpi_create_request(buf, count, datatype, MPI_ANY_SOURCE, rank, 0, comm, &request);
                smpi_mpi_irecv(request);
-               smpi_mpi_wait(request, MPI_STATUS_IGNORE);
-               xbt_mallocator_release(smpi_global->request_mallocator, request);
        }
 
+       smpi_mpi_wait(request, MPI_STATUS_IGNORE);
+       xbt_mallocator_release(smpi_global->request_mallocator, request);
+
        smpi_bench_begin();
 
        return retval;
@@ -221,7 +201,7 @@ int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm co
 
 // FIXME: needs to return null in event of MPI_UNDEFINED color...
 // FIXME: seriously, this isn't pretty
-int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
+int SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
 {
        int retval = MPI_SUCCESS;