X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bd9bee9dcbceb25fdb5a293b91abbd5476db7ad2..d30fcaa41c0aabda5afef028a793b9e295a4aadb:/src/smpi/smpi_base.c diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 9eee82fdd2..e5af68d34c 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -43,96 +43,100 @@ void smpi_mpi_sum_func(void *a, void *b, int *length, void smpi_mpi_sum_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]; - } - } 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]; - } - } + 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); 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]; - } - - }}}} + 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); 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]; - } - - }}}} + 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]; + } + + } } @@ -146,21 +150,21 @@ int smpi_mpi_comm_rank(smpi_mpi_communicator_t comm) return comm->index_to_rank_map[smpi_process_index()]; } -void smpi_process_init(int *argc, char***argv) +void smpi_process_init(int *argc, char ***argv) { smpi_process_data_t pdata; // initialize some local variables pdata = xbt_new(s_smpi_process_data_t, 1); - SIMIX_process_set_data(SIMIX_process_self(),pdata); + SIMIX_process_set_data(SIMIX_process_self(), pdata); /* 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; + 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)--; @@ -174,13 +178,15 @@ void smpi_process_init(int *argc, char***argv) 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); + smpi_sender, pdata, + SIMIX_host_get_name(SIMIX_host_self()), + 0, NULL, + /*props */ NULL); pdata->receiver = SIMIX_process_create("smpi_receiver", - smpi_receiver, pdata, - SIMIX_host_get_name(SIMIX_host_self()), 0, NULL, - /*props */ NULL); + smpi_receiver, pdata, + SIMIX_host_get_name(SIMIX_host_self + ()), 0, NULL, + /*props */ NULL); smpi_global->main_processes[pdata->index] = SIMIX_process_self(); return; @@ -188,13 +194,13 @@ void smpi_process_init(int *argc, char***argv) void smpi_process_finalize() { - smpi_process_data_t pdata = SIMIX_process_get_data(SIMIX_process_self()); + smpi_process_data_t pdata = SIMIX_process_get_data(SIMIX_process_self()); - pdata->finalize = 2; /* Tell sender and receiver to quit */ + 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); + while (pdata->finalize > 0) { /* wait until it's done */ + SIMIX_cond_wait(pdata->cond, pdata->mutex); } SIMIX_mutex_destroy(pdata->mutex); @@ -202,6 +208,7 @@ void smpi_process_finalize() xbt_fifo_free(pdata->pending_recv_request_queue); xbt_fifo_free(pdata->pending_send_request_queue); xbt_fifo_free(pdata->received_message_queue); + xbt_free(pdata); } int smpi_mpi_barrier(smpi_mpi_communicator_t comm) @@ -224,7 +231,7 @@ int smpi_mpi_barrier(smpi_mpi_communicator_t comm) int smpi_mpi_isend(smpi_mpi_request_t request) { - smpi_process_data_t pdata = SIMIX_process_get_data(SIMIX_process_self()); + smpi_process_data_t pdata = SIMIX_process_get_data(SIMIX_process_self()); int retval = MPI_SUCCESS; if (NULL == request) { @@ -240,7 +247,7 @@ int smpi_mpi_isend(smpi_mpi_request_t request) int smpi_mpi_irecv(smpi_mpi_request_t request) { int retval = MPI_SUCCESS; - smpi_process_data_t pdata = SIMIX_process_get_data(SIMIX_process_self()); + smpi_process_data_t pdata = SIMIX_process_get_data(SIMIX_process_self()); if (NULL == request) { retval = MPI_ERR_INTERN; @@ -255,6 +262,15 @@ int smpi_mpi_irecv(smpi_mpi_request_t request) return retval; } +void print_req( smpi_mpi_request_t r ); +void print_req( smpi_mpi_request_t r ) { + printf("***req %p-> src=%d dst=%d tag=%d completed=0x%x consumed=0x%x\n",r,r->src,r->dst,r->tag,r->completed,r->consumed); +} + + +/** + * wait and friends ... + **/ int smpi_mpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t * status) { int retval = MPI_SUCCESS; @@ -263,6 +279,10 @@ int smpi_mpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t * status) retval = MPI_ERR_INTERN; } else { SIMIX_mutex_lock(request->mutex); + +#ifdef DEBUG_STEPH + print_req( request ); //@@ +#endif while (!request->completed) { SIMIX_cond_wait(request->cond, request->mutex); } @@ -277,59 +297,83 @@ int smpi_mpi_wait(smpi_mpi_request_t request, smpi_mpi_status_t * status) return retval; } -int smpi_mpi_wait_all(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; cptcompleted && !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;cptcompleted) { /* 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; +/** + * waitany + **/ +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++) { + printf("...exam req[%d] of msg from [%d]\n",cpt,requests[cpt]->src); + if (requests[cpt]->completed && !requests[cpt]->consumed) { /* got ya */ + printf("...found match req[%d] of msg from [%d]\n",cpt,requests[cpt]->src); + *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++) { + +#ifdef DEBUG_STEPH + print_req( requests[cpt] ); +#endif + if (!requests[cpt]->completed) { /* this one is not done, wait on it */ + printf("... blocked waiting a msg %d->%d, tag=%d\n",requests[cpt]->src,requests[cpt]->dst,requests[cpt]->tag); + 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: +#ifdef DEBUG_STEPH + print_req( requests[cpt] ); +#endif + requests[*index]->consumed = 1; +#ifdef DEBUG_STEPH + print_req( requests[cpt] ); +#endif + printf("...accessing *req[%d]->consumed\n",cpt); + if (NULL != status) { + status->MPI_SOURCE = requests[*index]->src; + status->MPI_TAG = requests[*index]->tag; + status->MPI_ERROR = MPI_SUCCESS; + } + return MPI_SUCCESS; }