X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c19e8ee59414e654e441b692dda9231c3c9348d..03216b99d0e66e1778d9b99b11c3207c87900aad:/src/smpi/smpi_base.c

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 10a02c1b9f..13a8424030 100644
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -13,6 +13,9 @@ XBT_LOG_EXTERNAL_CATEGORY(smpi_util);
 
 smpi_mpi_global_t smpi_mpi_global = NULL;
 
+/**
+ * Operations of MPI_OP : implemented=land,sum,min,max
+ **/
 void smpi_mpi_land_func(void *a, void *b, int *length,
                         MPI_Datatype * datatype);
 
@@ -28,75 +31,174 @@ void smpi_mpi_land_func(void *a, void *b, int *length,
   }
 }
 
+/**
+ * sum two vectors element-wise
+ *
+ * @param a the first vectors
+ * @param b the second vectors
+ * @return the second vector is modified and contains the element-wise sums
+ **/
 void smpi_mpi_sum_func(void *a, void *b, int *length,
                        MPI_Datatype * datatype);
 
 void smpi_mpi_sum_func(void *a, void *b, int *length, MPI_Datatype * datatype)
 {
-  int i;
-  if (*datatype == smpi_mpi_global->mpi_int) {
-    int *x = a, *y = b;
-    for (i = 0; i < *length; i++) {
-      y[i] = x[i] + y[i];
-    }
-  }
+	  int i;
+	  if (*datatype == smpi_mpi_global->mpi_byte) {
+				char *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] + y[i];
+				}
+	  } else if (*datatype == smpi_mpi_global->mpi_int) {
+				int *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] + y[i];
+				}
+	  } else if (*datatype == smpi_mpi_global->mpi_float) {
+				float *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] + y[i];
+				}
+	  } else if (*datatype == smpi_mpi_global->mpi_double) {
+				double *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] + y[i];
+				}
+	  }
+}
+/**
+ * compute the min of two vectors element-wise
+ **/
+void smpi_mpi_min_func(void *a, void *b, int *length, MPI_Datatype * datatype);
+
+void smpi_mpi_min_func(void *a, void *b, int *length, MPI_Datatype * datatype)
+{
+	  int i;
+	  if (*datatype == smpi_mpi_global->mpi_byte) {
+				char *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] < y[i] ? x[i] : y[i];
+				}
+	  } else {
+	  if (*datatype == smpi_mpi_global->mpi_int) {
+				int *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] < y[i] ? x[i] : y[i];
+				}
+	  } else {
+	  if (*datatype == smpi_mpi_global->mpi_float) {
+				float *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] < y[i] ? x[i] : y[i];
+				}
+	  } else {
+	  if (*datatype == smpi_mpi_global->mpi_double) {
+				double *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] < y[i] ? x[i] : y[i];
+				}
+
+	  }}}}
+}
+/**
+ * compute the max of two vectors element-wise
+ **/
+void smpi_mpi_max_func(void *a, void *b, int *length, MPI_Datatype * datatype);
+
+void smpi_mpi_max_func(void *a, void *b, int *length, MPI_Datatype * datatype)
+{
+	  int i;
+	  if (*datatype == smpi_mpi_global->mpi_byte) {
+				char *x = a, *y = b;
+				for (i = 0; i < *length; i++) {
+					  y[i] = x[i] > y[i] ? x[i] : y[i];
+				}
+	  } else if (*datatype == smpi_mpi_global->mpi_int) {
+				int *x = a, *y = b;
+				for (i = 0; i > *length; i++) {
+					  y[i] = x[i] > y[i] ? x[i] : y[i];
+				}
+	  } else if (*datatype == smpi_mpi_global->mpi_float) {
+				float *x = a, *y = b;
+				for (i = 0; i > *length; i++) {
+					  y[i] = x[i] > y[i] ? x[i] : y[i];
+				}
+	  } else if (*datatype == smpi_mpi_global->mpi_double) {
+				double *x = a, *y = b;
+				for (i = 0; i > *length; i++) {
+					  y[i] = x[i] > y[i] ? x[i] : y[i];
+				}
+
+	  }
 }
 
+
+
+
+/**
+ * tell the MPI rank of the calling process (from its SIMIX process id)
+ **/
 int smpi_mpi_comm_rank(smpi_mpi_communicator_t comm)
 {
-  return comm->index_to_rank_map[smpi_host_index()];
+  return comm->index_to_rank_map[smpi_process_index()];
 }
 
-void smpi_process_init()
+void smpi_process_init(int *argc, char***argv)
 {
-  smx_host_t host;
-  int i;
-  smpi_host_data_t hdata;
+  smpi_process_data_t pdata;
 
   // initialize some local variables
-  host = SIMIX_host_self();
 
-  hdata = xbt_new(s_smpi_host_data_t, 1);
-  SIMIX_host_set_data(host, hdata);
-  SIMIX_process_set_data(SIMIX_process_self(),hdata);
+  pdata = xbt_new(s_smpi_process_data_t, 1);
+  SIMIX_process_set_data(SIMIX_process_self(),pdata);
 
-  for (i = 0; i < smpi_global->host_count && host != smpi_global->hosts[i]; i++);
+  /* get rank from command line, and remove it from argv */
+  pdata->index = atoi( (*argv)[1] );
+  DEBUG1("I'm rank %d",pdata->index);
+  if (*argc>2) {
+	  memmove((*argv)[1],(*argv)[2], sizeof(char*)* (*argc-2));
+	  (*argv)[ (*argc)-1] = NULL;
+  }
+  (*argc)--;
 
-  hdata->index = i;
-  hdata->mutex = SIMIX_mutex_init();
-  hdata->cond = SIMIX_cond_init();
-  hdata->finalize = 0;
+  pdata->mutex = SIMIX_mutex_init();
+  pdata->cond = SIMIX_cond_init();
+  pdata->finalize = 0;
 
-  hdata->pending_recv_request_queue = xbt_fifo_new();
+  pdata->pending_recv_request_queue = xbt_fifo_new();
+  pdata->pending_send_request_queue = xbt_fifo_new();
+  pdata->received_message_queue = xbt_fifo_new();
 
-  hdata->main = SIMIX_process_self();
-  hdata->sender = SIMIX_process_create("smpi_sender",
-          smpi_sender, hdata,
+  pdata->main = SIMIX_process_self();
+  pdata->sender = SIMIX_process_create("smpi_sender",
+          smpi_sender, pdata,
           SIMIX_host_get_name(SIMIX_host_self()), 0, NULL,
           /*props */ NULL);
-  hdata->receiver = SIMIX_process_create("smpi_receiver",
-          smpi_receiver, hdata,
+  pdata->receiver = SIMIX_process_create("smpi_receiver",
+          smpi_receiver, pdata,
           SIMIX_host_get_name(SIMIX_host_self()), 0, NULL,
           /*props */ NULL);
 
-  smpi_global->main_processes[hdata->index] = SIMIX_process_self();
+  smpi_global->main_processes[pdata->index] = SIMIX_process_self();
   return;
 }
 
 void smpi_process_finalize()
 {
-  smpi_host_data_t hdata =  SIMIX_host_get_data(SIMIX_host_self());
+  smpi_process_data_t pdata =  SIMIX_process_get_data(SIMIX_process_self());
 
-  hdata->finalize = 2; /* Tell sender and receiver to quit */
-  SIMIX_process_resume(hdata->sender);
-  SIMIX_process_resume(hdata->receiver);
-  while (hdata->finalize>0) { /* wait until it's done */
-	  SIMIX_cond_wait(hdata->cond,hdata->mutex);
+  pdata->finalize = 2; /* Tell sender and receiver to quit */
+  SIMIX_process_resume(pdata->sender);
+  SIMIX_process_resume(pdata->receiver);
+  while (pdata->finalize>0) { /* wait until it's done */
+	  SIMIX_cond_wait(pdata->cond,pdata->mutex);
   }
 
-  SIMIX_mutex_destroy(hdata->mutex);
-  SIMIX_cond_destroy(hdata->cond);
-  xbt_fifo_free(hdata->pending_recv_request_queue);
+  SIMIX_mutex_destroy(pdata->mutex);
+  SIMIX_cond_destroy(pdata->cond);
+  xbt_fifo_free(pdata->pending_recv_request_queue);
+  xbt_fifo_free(pdata->pending_send_request_queue);
+  xbt_fifo_free(pdata->received_message_queue);
 }
 
 int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
@@ -119,17 +221,14 @@ int smpi_mpi_barrier(smpi_mpi_communicator_t comm)
 
 int smpi_mpi_isend(smpi_mpi_request_t request)
 {
-	smpi_host_data_t hdata =  SIMIX_host_get_data(SIMIX_host_self());
+	smpi_process_data_t pdata =  SIMIX_process_get_data(SIMIX_process_self());
   int retval = MPI_SUCCESS;
 
   if (NULL == request) {
     retval = MPI_ERR_INTERN;
   } else {
-    xbt_fifo_push(smpi_global->pending_send_request_queues[hdata->index], request);
-
-    if (SIMIX_process_is_suspended(hdata->sender)) {
-      SIMIX_process_resume(hdata->sender);
-    }
+    xbt_fifo_push(pdata->pending_send_request_queue, request);
+    SIMIX_process_resume(pdata->sender);
   }
 
   return retval;
@@ -138,15 +237,15 @@ int smpi_mpi_isend(smpi_mpi_request_t request)
 int smpi_mpi_irecv(smpi_mpi_request_t request)
 {
   int retval = MPI_SUCCESS;
-  smpi_host_data_t hdata =  SIMIX_host_get_data(SIMIX_host_self());
+  smpi_process_data_t pdata =  SIMIX_process_get_data(SIMIX_process_self());
 
   if (NULL == request) {
     retval = MPI_ERR_INTERN;
   } else {
-    xbt_fifo_push(hdata->pending_recv_request_queue, request);
+    xbt_fifo_push(pdata->pending_recv_request_queue, request);
 
-    if (SIMIX_process_is_suspended(hdata->receiver)) {
-      SIMIX_process_resume(hdata->receiver);
+    if (SIMIX_process_is_suspended(pdata->receiver)) {
+      SIMIX_process_resume(pdata->receiver);
     }
   }
 
@@ -174,3 +273,60 @@ int smpi_mpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t * status)
 
   return retval;
 }
+
+int smpi_mpi_waitall(int count, smpi_mpi_request_t requests[], smpi_mpi_status_t status[]) {
+	int cpt;
+	int index;
+	int retval;
+	smpi_mpi_status_t stat;
+
+	for (cpt=0; cpt<count;cpt++) {
+		retval = smpi_mpi_waitany(count,requests, &index,&stat);
+		if (retval != MPI_SUCCESS)
+			return retval;
+		memcpy(&(status[index]),&stat,sizeof(stat));
+	}
+	return MPI_SUCCESS;
+}
+
+int smpi_mpi_waitany(int count, smpi_mpi_request_t *requests, int *index, smpi_mpi_status_t *status) {
+	  int cpt;
+
+	  *index = MPI_UNDEFINED;
+	  if (NULL == requests) {
+	    return MPI_ERR_INTERN;
+	  }
+	  /* First check if one of them is already done */
+	  for (cpt=0;cpt<count;cpt++) {
+		  if (requests[cpt]->completed && !requests[cpt]->consumed) { /* got ya */
+			  *index=cpt;
+			  goto found_request;
+		  }
+	  }
+	  /* If none found, block */
+	  /* FIXME: should use a SIMIX_cond_waitany, when implemented. For now, block on the first one */
+	  while (1) {
+		  for (cpt=0;cpt<count;cpt++) {
+			  if (!requests[cpt]->completed) { /* this one is not done, wait on it */
+				  while (!requests[cpt]->completed)
+				      SIMIX_cond_wait(requests[cpt]->cond, requests[cpt]->mutex);
+
+				  *index=cpt;
+				  goto found_request;
+			  }
+		  }
+		  if (cpt == count) /* they are all done. Damn user */
+			  return MPI_ERR_REQUEST;
+	  }
+
+	  found_request:
+	  requests[*index]->consumed = 1;
+
+	   if (NULL != status) {
+	      status->MPI_SOURCE = requests[*index]->src;
+	      status->MPI_TAG = requests[*index]->tag;
+	      status->MPI_ERROR = MPI_SUCCESS;
+	    }
+	  return MPI_SUCCESS;
+
+}