X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a8d08e384ecd75a045c666784aaa90dca92b3d1..c938dd8ed16398a3ab62eb83071bfe2ca4f6a91c:/src/smpi/smpi_base.c diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 6e4f684be4..2597663ff5 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -86,13 +86,13 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string) char *value = NULL; unsigned int iter = 0; s_smpi_factor_t fact; + fact.nb_values=0; int i=0; xbt_dynar_t smpi_factor, radical_elements, radical_elements2 = NULL; smpi_factor = xbt_dynar_new(sizeof(s_smpi_factor_t), NULL); radical_elements = xbt_str_split(smpi_coef_string, ";"); xbt_dynar_foreach(radical_elements, iter, value) { - fact.nb_values=0; radical_elements2 = xbt_str_split(value, ":"); if (xbt_dynar_length(radical_elements2) <2 || xbt_dynar_length(radical_elements2) > 5) xbt_die("Malformed radical for smpi factor!"); @@ -129,13 +129,13 @@ static double smpi_os(double size) double current=0.0; xbt_dynar_foreach(smpi_os_values, iter, fact) { if (size <= fact.factor) { - XBT_DEBUG("os : %lf <= %ld return %f", size, fact.factor, current); + XBT_DEBUG("os : %f <= %ld return %f", size, fact.factor, current); return current; }else{ current=fact.values[0]+fact.values[1]*size; } } - XBT_DEBUG("os : %lf > %ld return %f", size, fact.factor, current); + XBT_DEBUG("os : %f > %ld return %f", size, fact.factor, current); return current; } @@ -151,13 +151,13 @@ static double smpi_ois(double size) double current=0.0; xbt_dynar_foreach(smpi_ois_values, iter, fact) { if (size <= fact.factor) { - XBT_DEBUG("ois : %lf <= %ld return %f", size, fact.factor, current); + XBT_DEBUG("ois : %f <= %ld return %f", size, fact.factor, current); return current; }else{ current=fact.values[0]+fact.values[1]*size; } } - XBT_DEBUG("ois : %lf > %ld return %f", size, fact.factor, current); + XBT_DEBUG("ois : %f > %ld return %f", size, fact.factor, current); return current; } @@ -173,12 +173,12 @@ static double smpi_or(double size) double current=0.0; xbt_dynar_foreach(smpi_or_values, iter, fact) { if (size <= fact.factor) { - XBT_DEBUG("or : %lf <= %ld return %f", size, fact.factor, current); + XBT_DEBUG("or : %f <= %ld return %f", size, fact.factor, current); return current; }else current=fact.values[0]+fact.values[1]*size; } - XBT_DEBUG("or : %lf > %ld return %f", size, fact.factor, current); + XBT_DEBUG("or : %f > %ld return %f", size, fact.factor, current); return current; } @@ -285,7 +285,7 @@ static void smpi_mpi_request_free_voidp(void* request) MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, PERSISTENT | SEND | PREPARED); request->refcount++; @@ -295,7 +295,7 @@ MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, PERSISTENT | SSEND | SEND | PREPARED); request->refcount++; @@ -305,7 +305,7 @@ MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), src), smpi_process_index(), tag, comm, PERSISTENT | RECV | PREPARED); request->refcount++; @@ -316,10 +316,9 @@ void smpi_mpi_start(MPI_Request request) { smx_rdv_t mailbox; - xbt_assert(!request->action, - "Cannot (re)start a non-finished communication"); - if(request->flags & PREPARED)request->flags &= ~PREPARED; - if(request->flags & RECV) { + xbt_assert(!request->action, "Cannot (re)start a non-finished communication"); + request->flags &= ~PREPARED; + if (request->flags & RECV) { print_request("New recv", request); //FIXME: if receive is posted with a large size, but send is smaller, mailboxes may not match ! if (request->size < sg_cfg_get_int("smpi/async_small_thres")) @@ -336,7 +335,7 @@ void smpi_mpi_start(MPI_Request request) double sleeptime = request->detached ? smpi_or(request->size) : 0.0; if(sleeptime!=0.0){ simcall_process_sleep(sleeptime); - XBT_DEBUG("receiving size of %zu : sleep %lf ", request->size, smpi_or(request->size)); + XBT_DEBUG("receiving size of %zu : sleep %f ", request->size, smpi_or(request->size)); } } else { @@ -389,7 +388,7 @@ void smpi_mpi_start(MPI_Request request) if(sleeptime!=0.0){ simcall_process_sleep(sleeptime); - XBT_DEBUG("sending size of %zu : sleep %lf ", request->size, smpi_os(request->size)); + XBT_DEBUG("sending size of %zu : sleep %f ", request->size, smpi_os(request->size)); } request->action = @@ -415,6 +414,7 @@ void smpi_mpi_start(MPI_Request request) void smpi_mpi_startall(int count, MPI_Request * requests) { int i; + if(requests==NULL) return; for(i = 0; i < count; i++) { smpi_mpi_start(requests[i]); @@ -443,7 +443,7 @@ void smpi_mpi_request_free(MPI_Request * request) MPI_Request smpi_isend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf , count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, NON_PERSISTENT | ISEND | SEND | PREPARED); return request; @@ -452,7 +452,7 @@ MPI_Request smpi_isend_init(void *buf, int count, MPI_Datatype datatype, MPI_Request smpi_mpi_isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM?(void*)0:buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, NON_PERSISTENT | ISEND | SEND); smpi_mpi_start(request); @@ -462,7 +462,7 @@ MPI_Request smpi_mpi_isend(void *buf, int count, MPI_Datatype datatype, MPI_Request smpi_mpi_issend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, NON_PERSISTENT | ISEND | SSEND | SEND); smpi_mpi_start(request); @@ -474,7 +474,7 @@ MPI_Request smpi_mpi_issend(void *buf, int count, MPI_Datatype datatype, MPI_Request smpi_irecv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), src), smpi_process_index(), tag, comm, NON_PERSISTENT | RECV | PREPARED); return request; @@ -483,7 +483,7 @@ MPI_Request smpi_irecv_init(void *buf, int count, MPI_Datatype datatype, MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), src), smpi_process_index(), tag, comm, NON_PERSISTENT | RECV); smpi_mpi_start(request); @@ -493,7 +493,7 @@ MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype, void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status * status) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = smpi_mpi_irecv(buf, count, datatype, src, tag, comm); smpi_mpi_wait(&request, status); request = NULL; @@ -504,7 +504,7 @@ void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src, void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, NON_PERSISTENT | SEND); @@ -516,7 +516,7 @@ void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, void smpi_mpi_ssend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request = NULL; + MPI_Request request = NULL; /* MC needs the comm to be set to NULL during the call */ request = build_request(buf==MPI_BOTTOM ? (void*)0 : buf, count, datatype, smpi_process_index(), smpi_group_index(smpi_comm_group(comm), dst), tag, comm, NON_PERSISTENT | SSEND | SEND); @@ -614,15 +614,15 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) { int flag; //assume that request is not MPI_REQUEST_NULL (filtered in PMPI_Test or smpi_mpi_testall before) - if ((*request)->action == NULL) - flag = 1; - else - flag = simcall_comm_test((*request)->action); - if(flag) { - finish_wait(request, status); - *request = MPI_REQUEST_NULL; - }else{ - smpi_empty_status(status); + smpi_empty_status(status); + flag = 1; + if (!((*request)->flags & PREPARED)) { + if ((*request)->action != NULL) + flag = simcall_comm_test((*request)->action); + if (flag) { + finish_wait(request, status); + *request = MPI_REQUEST_NULL; + } } return flag; } @@ -640,7 +640,8 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index, map = xbt_new(int, count); size = 0; for(i = 0; i < count; i++) { - if((requests[i]!=MPI_REQUEST_NULL) && requests[i]->action) { + if ((requests[i] != MPI_REQUEST_NULL) && requests[i]->action && + !(requests[i]->flags & PREPARED)) { xbt_dynar_push(comms, &requests[i]->action); map[size] = i; size++; @@ -652,6 +653,7 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index, if(i != -1) { *index = map[i]; finish_wait(&requests[*index], status); + requests[*index] = MPI_REQUEST_NULL; flag = 1; } }else{ @@ -674,7 +676,7 @@ int smpi_mpi_testall(int count, MPI_Request requests[], int flag=1; int i; for(i=0; iflags & PREPARED)) { if (smpi_mpi_test(&requests[i], pstat)!=1){ flag=0; }else{ @@ -751,12 +753,17 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* void smpi_mpi_wait(MPI_Request * request, MPI_Status * status) { print_request("Waiting", *request); + if ((*request)->flags & PREPARED) { + smpi_empty_status(status); + return; + } + if ((*request)->action != NULL) { // this is not a detached send simcall_comm_wait((*request)->action, -1.0); } #ifdef HAVE_MC - if(MC_is_active()) + if(MC_is_active() && (*request)->action) (*request)->action->comm.dst_data = NULL; // dangling pointer : dst_data is freed with a wait, need to set it to NULL for system state comparison #endif @@ -780,7 +787,7 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], size = 0; XBT_DEBUG("Wait for one of %d", count); for(i = 0; i < count; i++) { - if(requests[i] != MPI_REQUEST_NULL) { + if (requests[i] != MPI_REQUEST_NULL && !(requests[i]->flags & PREPARED)) { if (requests[i]->action != NULL) { XBT_DEBUG("Waiting any %p ", requests[i]); xbt_dynar_push(comms, &requests[i]->action); @@ -803,6 +810,7 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], if (i != -1) { index = map[i]; finish_wait(&requests[index], status); + requests[index] = MPI_REQUEST_NULL; } } xbt_free(map); @@ -825,7 +833,8 @@ int smpi_mpi_waitall(int count, MPI_Request requests[], //tag invalid requests in the set if (status != MPI_STATUSES_IGNORE) { for (c = 0; c < count; c++) { - if (requests[c] == MPI_REQUEST_NULL || requests[c]->dst == MPI_PROC_NULL) { + if (requests[c] == MPI_REQUEST_NULL || requests[c]->dst == MPI_PROC_NULL || + (requests[c]->flags & PREPARED)) { smpi_empty_status(&status[c]); } else if (requests[c]->src == MPI_PROC_NULL) { smpi_empty_status(&status[c]);