X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70e4dad5ffd1ba6f56eb7bc97408411b9a73119b..1bb45eb32ee32ccf1ac08faff0e771c28679ecbb:/src/smpi/smpi_mpi.c

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index b29243e007..7d7ccf44c7 100644
--- 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,7 +98,7 @@ 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;
 
@@ -114,7 +114,7 @@ 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;
 	smpi_mpi_request_t request;
@@ -135,7 +135,7 @@ 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;
 
@@ -151,7 +151,7 @@ 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;
 	smpi_mpi_request_t request;
@@ -172,7 +172,11 @@ int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_
 	return retval;
 }
 
-int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
+int SMPI_MPI_Wait(MPI_Request *request, MPI_Status *status) {
+	return smpi_mpi_wait(*request, status);
+}
+
+int SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
 
 	int retval = MPI_SUCCESS;
 	int rank;
@@ -201,7 +205,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;
 
@@ -237,9 +241,9 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
 			retval = smpi_create_request(colorkey, 2, MPI_INT, MPI_ANY_SOURCE, rank, MPI_ANY_TAG, comm, &request);
 			smpi_mpi_irecv(request);
 			smpi_mpi_wait(request, &status);
+			colors[status.MPI_SOURCE] = colorkey[0];
+			keys[status.MPI_SOURCE]   = colorkey[1];
 			xbt_mallocator_release(smpi_global->request_mallocator, request);
-			colors[i] = colorkey[0];
-			keys[i]   = colorkey[1];
 		}
 
 		for (i = 0; i < comm->size; i++) {
@@ -256,41 +260,44 @@ int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *comm_out)
 					keycount++;
 				}
 			}
-			if (0 < keycount) {
-				// FIXME: yes, mock me, bubble sort...
-				for (j = 0; j < keycount; j++) {
-					for (k = keycount - 1; k > j; k--) {
-						if (keystmp[k] < keystmp[k - 1]) {
-							tmpval          = keystmp[k];
-							keystmp[k]      = keystmp[k - 1];
-							keystmp[k - 1]  = tmpval;
-
-							tmpval          = rankstmp[k];
-							rankstmp[k]     = rankstmp[k - 1];
-							rankstmp[k - 1] = tmpval;
-						}
+			// FIXME: yes, mock me, bubble sort...
+			for (j = 0; j < keycount; j++) {
+				for (k = j; k < keycount - 1; k++) {
+					if (keystmp[k] > keystmp[k + 1]) {
+						tmpval          = keystmp[k];
+						keystmp[k]      = keystmp[k + 1];
+						keystmp[k + 1]  = tmpval;
+
+						tmpval          = rankstmp[k];
+						rankstmp[k]     = rankstmp[k + 1];
+						rankstmp[k + 1] = tmpval;
 					}
 				}
-				tempcomm                    = xbt_new(s_smpi_mpi_communicator_t, 1);
-				tempcomm->barrier_count     = 0;
-				tempcomm->barrier_mutex     = SIMIX_mutex_init();
-				tempcomm->barrier_cond      = SIMIX_cond_init();
-				tempcomm->rank_to_index_map = xbt_new(int, keycount);
-				tempcomm->index_to_rank_map = xbt_new(int, smpi_global->host_count);
-				for (j = 0; j < smpi_global->host_count; j++) {
-					tempcomm->index_to_rank_map[j] = -1;
-				}
-				for (j = 0; j < keycount; j++) {
-					indextmp = comm->rank_to_index_map[rankstmp[j]];
-					tempcomm->rank_to_index_map[j]        = indextmp;
-					tempcomm->index_to_rank_map[indextmp] = j;
-				}
-				for (j = 0; j < keycount; j++) {
+			}
+			tempcomm                    = xbt_new(s_smpi_mpi_communicator_t, 1);
+			tempcomm->barrier_count     = 0;
+			tempcomm->size              = keycount;
+			tempcomm->barrier_mutex     = SIMIX_mutex_init();
+			tempcomm->barrier_cond      = SIMIX_cond_init();
+			tempcomm->rank_to_index_map = xbt_new(int, keycount);
+			tempcomm->index_to_rank_map = xbt_new(int, smpi_global->host_count);
+			for (j = 0; j < smpi_global->host_count; j++) {
+				tempcomm->index_to_rank_map[j] = -1;
+			}
+			for (j = 0; j < keycount; j++) {
+				indextmp = comm->rank_to_index_map[rankstmp[j]];
+				tempcomm->rank_to_index_map[j]        = indextmp;
+				tempcomm->index_to_rank_map[indextmp] = j;
+			}
+			for (j = 0; j < keycount; j++) {
+				if (rankstmp[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 {
+					*comm_out = tempcomm;
 				}
 			}
 		}