-/* Copyright (c) 2007-2013. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
static int factor_cmp(const void *pa, const void *pb)
{
- return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor);
+ return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor) ? 1 :
+ (((s_smpi_factor_t*)pa)->factor < ((s_smpi_factor_t*)pb)->factor) ? -1 : 0;
}
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;
+ memset(&fact, 0, sizeof(s_smpi_factor_t));
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!");
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;
}
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;
}
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;
}
request->truncated = 0;
request->real_size = 0;
request->real_tag = 0;
+ if(flags & PERSISTENT)
+ request->refcount = 1;
+ else
+ request->refcount = 0;
- request->refcount=1;
#ifdef HAVE_TRACING
request->send = 0;
request->recv = 0;
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++;
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 = 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++;
return request;
}
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++;
return request;
}
xbt_assert(!request->action, "Cannot (re)start a non-finished communication");
request->flags &= ~PREPARED;
+ request->flags &= ~FINISHED;
+ request->refcount++;
+
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 !
request->real_size=request->size;
smpi_datatype_use(request->old_type);
smpi_comm_use(request->comm);
- request->action = simcall_comm_irecv(mailbox, request->buf, &request->real_size, &match_recv, request);
+ request->action = simcall_comm_irecv(mailbox, request->buf,
+ &request->real_size, &match_recv,
+ request, -1.0);
//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));
+ XBT_DEBUG("receiving size of %zu : sleep %f ", request->size, smpi_or(request->size));
}
} else {
XBT_DEBUG("Send request %p is not in the permanent receive mailbox (buf: %p)",request,request->buf);
mailbox = smpi_process_remote_mailbox(receiver);
}
+
+ void* buf = request->buf;
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;
- if (oldbuf && request->size!=0){
- request->buf = xbt_malloc(request->size);
- memcpy(request->buf,oldbuf,request->size);
+ if (!_xbt_replay_is_active() && oldbuf && request->size!=0){
+ buf = xbt_malloc(request->size);
+ memcpy(buf,oldbuf,request->size);
}
}
XBT_DEBUG("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf);
smpi_comm_use(request->comm);
//if we are giving back the control to the user without waiting for completion, we have to inject timings
- double sleeptime =0.0;
+ 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){
+ 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 =
simcall_comm_isend(mailbox, request->size, -1.0,
- request->buf, request->real_size,
+ buf, request->real_size,
&match_send,
- &smpi_mpi_request_free_voidp, // how to free the userdata if a detached send fails
+ &xbt_free, // how to free the userdata if a detached send fails
request,
// detach if msg size < eager/rdv switch limit
request->detached);
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]);
*request = MPI_REQUEST_NULL;
}else{
print_request("Decrementing", (*request));
-
}
}else{
xbt_die("freeing an already free 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);
+ comm, PERSISTENT | ISEND | SEND | PREPARED);
return request;
}
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);
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);
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);
+ comm, PERSISTENT | RECV | PREPARED);
return request;
}
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);
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;
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);
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);
smpi_irecv_init(recvbuf, recvcount, recvtype, src, recvtag, comm);
smpi_mpi_startall(2, requests);
smpi_mpi_waitall(2, requests, stats);
+ smpi_mpi_request_free(&requests[0]);
+ smpi_mpi_request_free(&requests[1]);
if(status != MPI_STATUS_IGNORE) {
// Copy receive status
*status = stats[1];
MPI_Request req = *request;
smpi_empty_status(status);
- if(!(req->detached && req->flags & SEND) && !(req->flags & PREPARED)){
+ if(!(req->detached && req->flags & SEND)
+ && !(req->flags & PREPARED)){
if(status != MPI_STATUS_IGNORE) {
int src = req->src == MPI_ANY_SOURCE ? req->real_src : req->src;
status->MPI_SOURCE = smpi_group_rank(smpi_comm_group(req->comm), src);
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->flags & PERSISTENT)
req->action = NULL;
- }
+ req->flags |= FINISHED;
+
+ smpi_mpi_request_free(request);
+
}
int smpi_mpi_test(MPI_Request * request, MPI_Status * status) {
flag = simcall_comm_test((*request)->action);
if (flag) {
finish_wait(request, status);
+ if (*request != MPI_REQUEST_NULL && !((*request)->flags & PERSISTENT))
*request = MPI_REQUEST_NULL;
}
}
if(i != -1) {
*index = map[i];
finish_wait(&requests[*index], status);
+ if (requests[*index] != MPI_REQUEST_NULL && (requests[*index]->flags & NON_PERSISTENT))
requests[*index] = MPI_REQUEST_NULL;
flag = 1;
}
void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status){
MPI_Request request =build_request(NULL, 0, MPI_CHAR, source == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : smpi_group_index(smpi_comm_group(comm), source), smpi_comm_rank(comm), tag,
- comm, NON_PERSISTENT | RECV);
+ comm, PERSISTENT | RECV);
//to avoid deadlock, we have to sleep some time here, or the timer won't advance and we will only do iprobe simcalls
double sleeptime= sg_cfg_get_double("smpi/iprobe");
if ((*request)->action != NULL) { // this is not a detached send
simcall_comm_wait((*request)->action, -1.0);
- }
-
#ifdef HAVE_MC
if(MC_is_active())
(*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
+ }
finish_wait(request, status);
- *request = MPI_REQUEST_NULL;
+ if (*request != MPI_REQUEST_NULL && ((*request)->flags & NON_PERSISTENT))
+ *request = MPI_REQUEST_NULL;
// FIXME for a detached send, finish_wait is not called:
}
size = 0;
XBT_DEBUG("Wait for one of %d", count);
for(i = 0; i < count; i++) {
- if (requests[i] != MPI_REQUEST_NULL && !(requests[i]->flags & PREPARED)) {
+ if (requests[i] != MPI_REQUEST_NULL
+ && !(requests[i]->flags & PREPARED)
+ && !(requests[i]->flags & FINISHED)) {
if (requests[i]->action != NULL) {
XBT_DEBUG("Waiting any %p ", requests[i]);
xbt_dynar_push(comms, &requests[i]->action);
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
+ if (requests[i] != MPI_REQUEST_NULL && (requests[i]->flags & NON_PERSISTENT))
requests[i]=MPI_REQUEST_NULL;//set to null
break;
}
if (i != -1) {
index = map[i];
finish_wait(&requests[index], status);
+ if (requests[i] != MPI_REQUEST_NULL && (requests[i]->flags & NON_PERSISTENT))
requests[index] = MPI_REQUEST_NULL;
}
}
}
}
for(c = 0; c < count; c++) {
+
if (MC_is_active()) {
smpi_mpi_wait(&requests[c], pstat);
index = c;
index = smpi_mpi_waitany(count, requests, pstat);
if (index == MPI_UNDEFINED)
break;
+ if (requests[index] != MPI_REQUEST_NULL && (requests[index]->flags & NON_PERSISTENT))
requests[index]=MPI_REQUEST_NULL;
}
if (status != MPI_STATUSES_IGNORE) {
if(status != MPI_STATUSES_IGNORE) {
status[index] = *pstat;
}
+ if (requests[index] != MPI_REQUEST_NULL && (requests[index]->flags & NON_PERSISTENT))
requests[index]=MPI_REQUEST_NULL;
}else{
return MPI_UNDEFINED;
if(status != MPI_STATUSES_IGNORE) {
status[i] = *pstat;
}
+ if ((requests[i] != MPI_REQUEST_NULL) && requests[i]->flags & NON_PERSISTENT)
requests[i]=MPI_REQUEST_NULL;
-
}
}else{
count_dead++;
// Wait for completion of irecv's.
smpi_mpi_startall(size - 1, requests);
smpi_mpi_waitall(size - 1, requests, MPI_STATUS_IGNORE);
+ for(src = 0; src < size-1; src++) {
+ smpi_mpi_request_free(&requests[src]);
+ }
xbt_free(requests);
}
}
// Wait for completion of irecv's.
smpi_mpi_startall(size - 1, requests);
smpi_mpi_waitall(size - 1, requests, MPI_STATUS_IGNORE);
+ for(src = 0; src < size-1; src++) {
+ smpi_mpi_request_free(&requests[src]);
+ }
xbt_free(requests);
}
}
// Wait for completion of all comms.
smpi_mpi_startall(2 * (size - 1), requests);
smpi_mpi_waitall(2 * (size - 1), requests, MPI_STATUS_IGNORE);
+ for(other = 0; other < 2*(size-1); other++) {
+ smpi_mpi_request_free(&requests[other]);
+ }
xbt_free(requests);
}
// Wait for completion of all comms.
smpi_mpi_startall(2 * (size - 1), requests);
smpi_mpi_waitall(2 * (size - 1), requests, MPI_STATUS_IGNORE);
+ for(other = 0; other < 2*(size-1); other++) {
+ smpi_mpi_request_free(&requests[other]);
+ }
xbt_free(requests);
}
// Wait for completion of isend's.
smpi_mpi_startall(size - 1, requests);
smpi_mpi_waitall(size - 1, requests, MPI_STATUS_IGNORE);
+ for(dst = 0; dst < size-1; dst++) {
+ smpi_mpi_request_free(&requests[dst]);
+ }
xbt_free(requests);
}
}
// Wait for completion of isend's.
smpi_mpi_startall(size - 1, requests);
smpi_mpi_waitall(size - 1, requests, MPI_STATUS_IGNORE);
+ for(dst = 0; dst < size-1; dst++) {
+ smpi_mpi_request_free(&requests[dst]);
+ }
xbt_free(requests);
}
}
XBT_DEBUG("finished waiting any request with index %d", index);
if(index == MPI_UNDEFINED) {
break;
+ }else{
+ smpi_mpi_request_free(&requests[index]);
}
if(op) /* op can be MPI_OP_NULL that does nothing */
smpi_op_apply(op, tmpbufs[index], recvbuf, &count, &datatype);
for(index = 0; index < rank; index++) {
xbt_free(tmpbufs[index]);
}
+ for(index = 0; index < size-1; index++) {
+ smpi_mpi_request_free(&requests[index]);
+ }
xbt_free(tmpbufs);
xbt_free(requests);
}
for(index = 0; index < rank; index++) {
xbt_free(tmpbufs[index]);
}
+ for(index = 0; index < size-1; index++) {
+ smpi_mpi_request_free(&requests[index]);
+ }
xbt_free(tmpbufs);
xbt_free(requests);
}