Visual C++ config doesn't use the gnu functions

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

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index 97ce5df..8fdb8a1 100644 (file)
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -1,3 +1,5 @@
+// FIXME: remove
+#include <stdio.h>
 #include "private.h"
 
 int MPI_Init(int *argc, char ***argv)
@@ -182,6 +184,43 @@ 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 retval = MPI_SUCCESS;
+       int rank;
+
+       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);
+       } else {
+               smpi_mpi_request_t request;
+               retval = smpi_create_request(buf, count, datatype, root, rank, 0, comm, &request);
+               smpi_mpi_irecv(request);
+               smpi_mpi_wait(request, MPI_STATUS_IGNORE);
+               xbt_mallocator_release(smpi_global->request_mallocator, request);
+       }
+
+       smpi_bench_begin();
+
+       return retval;
+}
+
+// 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 retval = MPI_SUCCESS;
@@ -199,7 +238,6 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
        rank  = comm->index_to_rank_map[index];
 
        if (0 == rank) {
-
                int *colors = xbt_new(int, comm->size);
                int *keys   = xbt_new(int, comm->size);
                int i, j, k;
@@ -267,18 +305,26 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
                                        tempcomm->rank_to_index_map[j]        = indextmp;
                                        tempcomm->index_to_rank_map[indextmp] = j;
                                }
-                               // FIXME: now send new communicator to happy troops...
+                               for (j = 0; j < keycount; j++) {
+                                       retval = smpi_create_request(&j, 1, MPI_INT, 0, rankstmp[j], 0, comm, &request);
+                                       request->data = tempcomm;
+                                       smpi_mpi_isend(request);
+                                       smpi_mpi_wait(request, &status);
+                                       xbt_mallocator_release(smpi_global->request_mallocator, request);
+                               }
                        }
                }
-
        } else {
-
                colorkey[0] = color;
                colorkey[1] = key;
                retval = smpi_create_request(colorkey, 2, MPI_INT, rank, 0, 0, comm, &request);
                smpi_mpi_isend(request);
                smpi_mpi_wait(request, &status);
                xbt_mallocator_release(smpi_global->request_mallocator, request);
+               retval = smpi_create_request(colorkey, 1, MPI_INT, 0, rank, 0, comm, &request);
+               smpi_mpi_irecv(request);
+               smpi_mpi_wait(request, &status);
+               *comm_out = request->data;
        }
 
        smpi_bench_begin();