X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b4649c05f79527c8befbf7fac7a85ef6184ac032..02a13cd46eff988e8fad0711433787059f72b319:/src/smpi/smpi_base.c diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 82fade3879..e0cfc66d28 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -11,6 +11,7 @@ #include #include "simix/smx_private.h" #include "surf/surf.h" +#include "simgrid/sg_config.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)"); @@ -23,8 +24,18 @@ static int match_recv(void* a, void* b, smx_action_t ignored) { xbt_assert(ref, "Cannot match recv against null reference"); xbt_assert(req, "Cannot match recv against null request"); - return (ref->src == MPI_ANY_SOURCE || req->src == ref->src) - && (ref->tag == MPI_ANY_TAG || req->tag == ref->tag); + if((ref->src == MPI_ANY_SOURCE || req->src == ref->src) + && (ref->tag == MPI_ANY_TAG || req->tag == ref->tag)){ + //we match, we can transfer some values + // FIXME : move this to the copy function ? + if(ref->src == MPI_ANY_SOURCE)ref->real_src = req->src; + if(ref->tag == MPI_ANY_TAG)ref->real_tag = req->tag; + if(ref->real_size < req->real_size) ref->truncated = 1; + if(req->detached==1){ + ref->detached_sender=req; //tie the sender to the receiver, as it is detached and has to be freed in the receiver + } + return 1; + }else return 0; } static int match_send(void* a, void* b,smx_action_t ignored) { @@ -33,8 +44,142 @@ static int match_send(void* a, void* b,smx_action_t ignored) { XBT_DEBUG("Trying to match a send of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag); xbt_assert(ref, "Cannot match send against null reference"); xbt_assert(req, "Cannot match send against null request"); - return (req->src == MPI_ANY_SOURCE || req->src == ref->src) - && (req->tag == MPI_ANY_TAG || req->tag == ref->tag); + + if((req->src == MPI_ANY_SOURCE || req->src == ref->src) + && (req->tag == MPI_ANY_TAG || req->tag == ref->tag)) + { + if(req->src == MPI_ANY_SOURCE)req->real_src = ref->src; + if(req->tag == MPI_ANY_TAG)req->real_tag = ref->tag; + if(req->real_size < ref->real_size) req->truncated = 1; + if(ref->detached==1){ + req->detached_sender=ref; //tie the sender to the receiver, as it is detached and has to be freed in the receiver + } + + return 1; + } else return 0; +} + + +typedef struct s_smpi_factor *smpi_factor_t; +typedef struct s_smpi_factor { + long factor; + int nb_values; + double values[4];//arbitrary set to 4 +} s_smpi_factor_t; +xbt_dynar_t smpi_os_values = NULL; +xbt_dynar_t smpi_or_values = NULL; +xbt_dynar_t smpi_ois_values = NULL; + +// Methods used to parse and store the values for timing injections in smpi +// These are taken from surf/network.c and generalized to have more factors +// These methods should be merged with those in surf/network.c (moved somewhere in xbt ?) + +static int factor_cmp(const void *pa, const void *pb) +{ + return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor); +} + + +static xbt_dynar_t parse_factor(const char *smpi_coef_string) +{ + char *value = NULL; + unsigned int iter = 0; + s_smpi_factor_t fact; + 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!"); + for(i =0; i %ld return %f", size, fact.factor, current); + + return current; +} + +static double smpi_ois(double size) +{ + if (!smpi_ois_values) { + smpi_ois_values = parse_factor(sg_cfg_get_string("smpi/ois")); + smpi_register_static(smpi_ois_values, xbt_dynar_free_voidp); + } + unsigned int iter = 0; + s_smpi_factor_t fact; + 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); + return current; + }else{ + current=fact.values[0]+fact.values[1]*size; + } + } + XBT_DEBUG("ois : %lf > %ld return %f", size, fact.factor, current); + + return current; +} + +static double smpi_or(double size) +{ + if (!smpi_or_values) { + smpi_or_values = parse_factor(sg_cfg_get_string("smpi/or")); + smpi_register_static(smpi_or_values, xbt_dynar_free_voidp); + } + unsigned int iter = 0; + s_smpi_factor_t fact; + 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); + return current; + }else + current=fact.values[0]+fact.values[1]*size; + } + XBT_DEBUG("or : %lf > %ld return %f", size, fact.factor, current); + + return current; } static MPI_Request build_request(void *buf, int count, @@ -52,7 +197,7 @@ static MPI_Request build_request(void *buf, int count, if(datatype->has_subtype == 1){ // This part handles the problem of non-contiguous memory old_buf = buf; - buf = malloc(count*smpi_datatype_size(datatype)); + buf = count==0 ? NULL : xbt_malloc(count*smpi_datatype_size(datatype)); if (flags & SEND) { subtype->serialize(old_buf, buf, count, datatype->substruct); } @@ -72,19 +217,30 @@ static MPI_Request build_request(void *buf, int count, request->action = NULL; request->flags = flags; request->detached = 0; + request->detached_sender = NULL; + + request->truncated = 0; + request->real_size = 0; + request->real_tag = 0; + + request->refcount=1; #ifdef HAVE_TRACING request->send = 0; request->recv = 0; #endif + if (flags & SEND) smpi_datatype_unuse(datatype); + return request; } -void smpi_empty_status(MPI_Status * status) { +void smpi_empty_status(MPI_Status * status) +{ if(status != MPI_STATUS_IGNORE) { - status->MPI_SOURCE=MPI_ANY_SOURCE; - status->MPI_TAG=MPI_ANY_TAG; - status->count=0; + status->MPI_SOURCE = MPI_ANY_SOURCE; + status->MPI_TAG = MPI_ANY_TAG; + status->MPI_ERROR = MPI_SUCCESS; + status->count=0; } } @@ -130,7 +286,17 @@ MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype, MPI_Request request = build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, comm, PERSISTENT | SEND); + request->refcount++; + return request; +} +MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype, + int dst, int tag, MPI_Comm comm) +{ + MPI_Request request = + build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + comm, PERSISTENT | SSEND | SEND); + request->refcount++; return request; } @@ -140,7 +306,7 @@ MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, MPI_Request request = build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, comm, PERSISTENT | RECV); - + request->refcount++; return request; } @@ -152,55 +318,88 @@ void smpi_mpi_start(MPI_Request request) "Cannot (re)start a non-finished communication"); if(request->flags & RECV) { print_request("New recv", request); - if (request->size < surf_cfg_get_int("smpi/async_small_thres")) + if (request->size < sg_cfg_get_int("smpi/async_small_thres")) mailbox = smpi_process_mailbox_small(); else mailbox = smpi_process_mailbox(); + // we make a copy here, as the size is modified by simix, and we may reuse the request in another receive later + request->real_size=request->size; + smpi_datatype_use(request->old_type); + request->action = simcall_comm_irecv(mailbox, request->buf, &request->real_size, &match_recv, request); + + //integrate pseudo-timing for buffering of small messages, do not bother to execute the simcall if 0 + 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)); + } - // FIXME: SIMIX does not yet support non-contiguous datatypes - request->action = simcall_comm_irecv(mailbox, request->buf, &request->size, &match_recv, request); - if (request->action)request->action->comm.refcount++; } else { + int receiver = smpi_group_index(smpi_comm_group(request->comm), request->dst); + + #ifdef HAVE_TRACING + int rank = smpi_process_index(); + if (TRACE_smpi_view_internals()) { + TRACE_smpi_send(rank, rank, receiver); + } + #endif /* if(receiver == MPI_UNDEFINED) {*/ /* XBT_WARN("Trying to send a message to a wrong rank");*/ /* return;*/ /* }*/ print_request("New send", request); - if (request->size < surf_cfg_get_int("smpi/async_small_thres")) { // eager mode + if (request->size < sg_cfg_get_int("smpi/async_small_thres")) { // eager mode mailbox = smpi_process_remote_mailbox_small(receiver); }else{ XBT_DEBUG("Send request %p is not in the permanent receive mailbox (buf: %p)",request,request->buf); mailbox = smpi_process_remote_mailbox(receiver); } - if (request->size < 64*1024 ) { //(FIXME: this limit should be configurable) + if ( (! (request->flags & SSEND)) && (request->size < sg_cfg_get_int("smpi/send_is_detached_thres"))) { void *oldbuf = NULL; + request->detached = 1; + request->refcount++; if(request->old_type->has_subtype == 0){ oldbuf = request->buf; - request->detached = 1; - if (oldbuf){ - request->buf = malloc(request->size); + if (oldbuf && request->size!=0){ + request->buf = xbt_malloc(request->size); memcpy(request->buf,oldbuf,request->size); } } XBT_DEBUG("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf); } + // we make a copy here, as the size is modified by simix, and we may reuse the request in another receive later + request->real_size=request->size; + smpi_datatype_use(request->old_type); + + //if we are giving back the control to the user without waiting for completion, we have to inject timings + double sleeptime =0.0; + if(request->detached || (request->flags & (ISEND|SSEND))){// issend should be treated as isend + //isend and send timings may be different + sleeptime = (request->flags & ISEND)? smpi_ois(request->size) : smpi_os(request->size); + } + + if(sleeptime!=0.0){ + simcall_process_sleep(sleeptime); + XBT_DEBUG("sending size of %zu : sleep %lf ", request->size, smpi_os(request->size)); + } + request->action = simcall_comm_isend(mailbox, request->size, -1.0, - request->buf, request->size, + request->buf, request->real_size, &match_send, &smpi_mpi_request_free_voidp, // how to free the userdata if a detached send fails request, // detach if msg size < eager/rdv switch limit request->detached); - if (request->action)request->action->comm.refcount++; #ifdef HAVE_TRACING /* FIXME: detached sends are not traceable (request->action == NULL) */ if (request->action) simcall_set_category(request->action, TRACE_internal_smpi_get_category()); + #endif } @@ -218,8 +417,18 @@ void smpi_mpi_startall(int count, MPI_Request * requests) void smpi_mpi_request_free(MPI_Request * request) { - xbt_free(*request); - *request = MPI_REQUEST_NULL; + + if((*request) != MPI_REQUEST_NULL){ + (*request)->refcount--; + if((*request)->refcount<0) xbt_die("wrong refcount"); + + if((*request)->refcount==0){ + xbt_free(*request); + *request = MPI_REQUEST_NULL; + } + }else{ + xbt_die("freeing an already free request"); + } } MPI_Request smpi_isend_init(void *buf, int count, MPI_Datatype datatype, @@ -236,12 +445,25 @@ MPI_Request smpi_mpi_isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - smpi_isend_init(buf, count, datatype, dst, tag, comm); + build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + comm, NON_PERSISTENT | ISEND | SEND); smpi_mpi_start(request); return request; } +MPI_Request smpi_mpi_issend(void *buf, int count, MPI_Datatype datatype, + int dst, int tag, MPI_Comm comm) +{ + MPI_Request request = + build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + comm, NON_PERSISTENT | ISEND | SSEND | SEND); + smpi_mpi_start(request); + return request; +} + + + MPI_Request smpi_irecv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { @@ -255,7 +477,8 @@ MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { MPI_Request request = - smpi_irecv_init(buf, count, datatype, src, tag, comm); + build_request(buf, count, datatype, src, smpi_comm_rank(comm), tag, + comm, NON_PERSISTENT | RECV); smpi_mpi_start(request); return request; @@ -275,14 +498,24 @@ void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = - build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, - comm, NON_PERSISTENT | SEND | RECV_DELETE); + build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + comm, NON_PERSISTENT | SEND); smpi_mpi_start(request); smpi_mpi_wait(&request, MPI_STATUS_IGNORE); } +void smpi_mpi_ssend(void *buf, int count, MPI_Datatype datatype, + int dst, int tag, MPI_Comm comm) +{ + MPI_Request request = + build_request(buf, count, datatype, smpi_comm_rank(comm), dst, tag, + comm, NON_PERSISTENT | SSEND | SEND); + + smpi_mpi_start(request); smpi_mpi_wait(&request, MPI_STATUS_IGNORE); +} + void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void *recvbuf, int recvcount, MPI_Datatype recvtype, int src, int recvtag, @@ -299,7 +532,7 @@ void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, smpi_mpi_waitall(2, requests, stats); if(status != MPI_STATUS_IGNORE) { // Copy receive status - memcpy(status, &stats[1], sizeof(MPI_Status)); + *status = stats[1]; } } @@ -311,79 +544,53 @@ int smpi_mpi_get_count(MPI_Status * status, MPI_Datatype datatype) static void finish_wait(MPI_Request * request, MPI_Status * status) { MPI_Request req = *request; - // if we have a sender, we should use its data, and not the data from the receive - //FIXME : may fail if req->action has already been freed, the pointer being invalid - if((req->action)&& - (req->src==MPI_ANY_SOURCE || req->tag== MPI_ANY_TAG)) - //req = (MPI_Request)SIMIX_comm_get_src_data((*request)->action); - - if(status != MPI_STATUS_IGNORE) { - status->MPI_SOURCE = req->src; - status->MPI_TAG = req->tag; - //if((*request)->action && ((MPI_Request)SIMIX_comm_get_src_data((*request)->action))->size == (*request)->size) - status->MPI_ERROR = MPI_SUCCESS; - //else status->MPI_ERROR = MPI_ERR_TRUNCATE; - // this handles the case were size in receive differs from size in send - // FIXME: really this should just contain the count of receive-type blocks, - // right? - status->count = req->size; - } - req = *request; + if(status != MPI_STATUS_IGNORE) + smpi_empty_status(status); - print_request("Finishing", req); - MPI_Datatype datatype = req->old_type; - if(datatype->has_subtype == 1){ - // This part handles the problem of non-contignous memory - // the unserialization at the reception - s_smpi_subtype_t *subtype = datatype->substruct; - if(req->flags & RECV) { - subtype->unserialize(req->buf, req->old_buf, req->size/smpi_datatype_size(datatype) , datatype->substruct); + if(!(req->detached && req->flags & SEND)){ + if(status != MPI_STATUS_IGNORE) { + status->MPI_SOURCE = req->src == MPI_ANY_SOURCE ? req->real_src : req->src; + status->MPI_TAG = req->tag == MPI_ANY_TAG ? req->real_tag : req->tag; + status->MPI_ERROR = req->truncated ? MPI_ERR_TRUNCATE : MPI_SUCCESS; + // this handles the case were size in receive differs from size in send + // FIXME: really this should just contain the count of receive-type blocks, + // right? + status->count = req->real_size; } - if(req->detached == 0) free(req->buf); - } - + print_request("Finishing", req); + MPI_Datatype datatype = req->old_type; - if(req->flags & NON_PERSISTENT) { - if(req->flags & RECV && - req->action && - (req->action->state == SIMIX_DONE)) - { - MPI_Request sender_request = (MPI_Request)SIMIX_comm_get_src_data(req->action); - if((sender_request!=MPI_REQUEST_NULL) && - ( sender_request->detached ) && - ( sender_request->flags & RECV_DELETE)) - { - //we are in a receiver's wait from a detached send - //we have to clean the sender's side request here.... but only if done by a send, not an isend - //the request lives senderside for an isend. As detached is currently for send + isend, we use RECV_DELETE to separate them - //FIXME : see if just removing detached status for isend is also good - smpi_mpi_request_free(&sender_request); + if(datatype->has_subtype == 1){ + // This part handles the problem of non-contignous memory + // the unserialization at the reception + s_smpi_subtype_t *subtype = datatype->substruct; + if(req->flags & RECV) { + subtype->unserialize(req->buf, req->old_buf, req->real_size/smpi_datatype_size(datatype) , datatype->substruct); } + if(req->detached == 0) free(req->buf); } + smpi_datatype_unuse(datatype); + } - if(req->action){ - //if we want to free our request, we have to invalidate it at the other end of the comm - - if(req->flags & SEND){ - req->action->comm.src_data=MPI_REQUEST_NULL; - }else{ - req->action->comm.dst_data=MPI_REQUEST_NULL; +#ifdef HAVE_TRACING + if (TRACE_smpi_view_internals()) { + if(req->flags & RECV){ + int rank = smpi_process_index(); + int src_traced = smpi_group_index(smpi_comm_group(req->comm), req->src == MPI_ANY_SOURCE ? req->real_src : req->src); + TRACE_smpi_recv(rank, src_traced, rank); } - - smx_action_t temp=req->action; - if(req->action->comm.refcount == 1)req->action = NULL; - SIMIX_comm_destroy(temp); } +#endif + if(req->detached_sender!=NULL){ + smpi_mpi_request_free(&(req->detached_sender)); + } - + if(req->flags & NON_PERSISTENT) { smpi_mpi_request_free(request); - - } else { - if(req->action)SIMIX_comm_destroy(req->action); req->action = NULL; } } @@ -398,6 +605,7 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) { flag = simcall_comm_test((*request)->action); if(flag) { finish_wait(request, status); + request=MPI_REQUEST_NULL; }else{ smpi_empty_status(status); } @@ -461,7 +669,7 @@ int smpi_mpi_testall(int count, MPI_Request requests[], smpi_empty_status(pstat); } if(status != MPI_STATUSES_IGNORE) { - memcpy(&status[i], pstat, sizeof(*pstat)); + status[i] = *pstat; } } return flag; @@ -489,7 +697,7 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* print_request("New iprobe", request); // We have to test both mailboxes as we don't know if we will receive one one or another - if (surf_cfg_get_int("smpi/async_small_thres")>0){ + if (sg_cfg_get_int("smpi/async_small_thres")>0){ mailbox = smpi_process_mailbox_small(); XBT_DEBUG("trying to probe the perm recv mailbox"); request->action = simcall_comm_iprobe(mailbox, request->src, request->tag, &match_recv, (void*)request); @@ -507,7 +715,7 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status->MPI_SOURCE = req->src; status->MPI_TAG = req->tag; status->MPI_ERROR = MPI_SUCCESS; - status->count = req->size; + status->count = req->real_size; } } else *flag = 0; @@ -521,8 +729,9 @@ void smpi_mpi_wait(MPI_Request * request, MPI_Status * status) print_request("Waiting", *request); if ((*request)->action != NULL) { // this is not a detached send simcall_comm_wait((*request)->action, -1.0); - finish_wait(request, status); } + finish_wait(request, status); + // FIXME for a detached send, finish_wait is not called: } @@ -539,13 +748,22 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], comms = xbt_dynar_new(sizeof(smx_action_t), NULL); map = xbt_new(int, count); size = 0; - XBT_DEBUG("Wait for one of"); + XBT_DEBUG("Wait for one of %d", count); for(i = 0; i < count; i++) { - if((requests[i] != MPI_REQUEST_NULL) && (requests[i]->action != NULL)) { - print_request("Waiting any ", requests[i]); - xbt_dynar_push(comms, &requests[i]->action); - map[size] = i; - size++; + if(requests[i] != MPI_REQUEST_NULL) { + if (requests[i]->action != NULL) { + XBT_DEBUG("Waiting any %p ", requests[i]); + xbt_dynar_push(comms, &requests[i]->action); + map[size] = i; + size++; + }else{ + //This is a finished detached request, let's return this one + size=0;//so we free the dynar but don't do the waitany call + index=i; + finish_wait(&requests[i], status);//cleanup if refcount = 0 + requests[i]=MPI_REQUEST_NULL;//set to null + break; + } } } if(size > 0) { @@ -573,36 +791,35 @@ int smpi_mpi_waitall(int count, MPI_Request requests[], int index, c; MPI_Status stat; MPI_Status *pstat = status == MPI_STATUSES_IGNORE ? MPI_STATUS_IGNORE : &stat; - int retvalue=MPI_SUCCESS; + int retvalue = MPI_SUCCESS; //tag invalid requests in the set - for(c = 0; c < count; c++) { - if(requests[c]==MPI_REQUEST_NULL || requests[c]->dst == MPI_PROC_NULL ){ - if(status != MPI_STATUSES_IGNORE) + if (status != MPI_STATUSES_IGNORE) { + for (c = 0; c < count; c++) { + if (requests[c] == MPI_REQUEST_NULL || requests[c]->dst == MPI_PROC_NULL) { smpi_empty_status(&status[c]); - }else if(requests[c]->src == MPI_PROC_NULL ){ - if(status != MPI_STATUSES_IGNORE) { + } else if (requests[c]->src == MPI_PROC_NULL) { smpi_empty_status(&status[c]); - status[c].MPI_SOURCE=MPI_PROC_NULL; + status[c].MPI_SOURCE = MPI_PROC_NULL; } } } - for(c = 0; c < count; c++) { - if(MC_is_active()) { - smpi_mpi_wait(&requests[c], pstat); - index = c; - } else { - index = smpi_mpi_waitany(count, requests, pstat); - if(index == MPI_UNDEFINED) { - break; - } - if(status != MPI_STATUSES_IGNORE) { - memcpy(&status[index], pstat, sizeof(*pstat)); - if(status[index].MPI_ERROR==MPI_ERR_TRUNCATE)retvalue=MPI_ERR_IN_STATUS; - - } + if (MC_is_active()) { + smpi_mpi_wait(&requests[c], pstat); + index = c; + } else { + index = smpi_mpi_waitany(count, requests, pstat); + if (index == MPI_UNDEFINED) + break; + requests[index]=MPI_REQUEST_NULL; + } + if (status != MPI_STATUSES_IGNORE) { + status[index] = *pstat; + if (status[index].MPI_ERROR == MPI_ERR_TRUNCATE) + retvalue = MPI_ERR_IN_STATUS; } } + return retvalue; } @@ -621,8 +838,9 @@ int smpi_mpi_waitsome(int incount, MPI_Request requests[], int *indices, indices[count] = index; count++; if(status != MPI_STATUSES_IGNORE) { - memcpy(&status[index], pstat, sizeof(*pstat)); + status[index] = *pstat; } + requests[index]=MPI_REQUEST_NULL; }else{ return MPI_UNDEFINED; } @@ -645,8 +863,10 @@ int smpi_mpi_testsome(int incount, MPI_Request requests[], int *indices, indices[count] = i; count++; if(status != MPI_STATUSES_IGNORE) { - memcpy(&status[i], pstat, sizeof(*pstat)); + status[i] = *pstat; } + requests[i]=MPI_REQUEST_NULL; + } }else{ count_dead++;