-/* 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
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;
request->refcount++;
if(request->old_type->has_subtype == 0){
oldbuf = request->buf;
- if (oldbuf && request->size!=0){
+ if (!_xbt_replay_is_active() && oldbuf && request->size!=0){
request->buf = xbt_malloc(request->size);
memcpy(request->buf,oldbuf,request->size);
}
simcall_comm_isend(mailbox, request->size, -1.0,
request->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);
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
+ }
finish_wait(request, status);
*request = MPI_REQUEST_NULL;