xbt_dynar_t smpi_or_values = NULL;
xbt_dynar_t smpi_ois_values = NULL;
+double smpi_wtime_sleep = 0.0;
+double smpi_iprobe_sleep = 1e-4;
+double smpi_test_sleep = 1e-4;
+
+
// 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 ?)
return current;
}
-double smpi_wtime(){
+double smpi_mpi_wtime(){
double time;
if (smpi_process_initialized() && !smpi_process_finalized() && !smpi_process_get_sampling()) {
smpi_bench_end();
time = SIMIX_get_clock();
//to avoid deadlocks if called too many times
- double sleeptime= sg_cfg_get_double("smpi/wtime");
- simcall_process_sleep(sleeptime);
+ if(smpi_wtime_sleep > 0) simcall_process_sleep(smpi_wtime_sleep);
smpi_bench_begin();
} else {
time = SIMIX_get_clock();
void smpi_mpi_start(MPI_Request request)
{
smx_rdv_t mailbox;
-
+
xbt_assert(!request->action, "Cannot (re)start a non-finished communication");
request->flags &= ~PREPARED;
request->flags &= ~FINISHED;
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->flags & RMA || request->size < sg_cfg_get_int("smpi/async_small_thres"))
mailbox = smpi_process_mailbox_small();
- else
- mailbox = smpi_process_mailbox();
+ else{
+ mailbox = smpi_process_mailbox_small();
+ XBT_VERB("Is there a corresponding send already posted the small mailbox?");
+ smx_action_t action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request);
+
+ if(action ==NULL){
+ XBT_VERB("No, nothing in the permanent receive mailbox");
+ mailbox = smpi_process_mailbox();
+ }else{
+ XBT_VERB("yes there was something for us in the other 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);
} else {
- int receiver = request->dst;//smpi_group_index(smpi_comm_group(request->comm), request->dst);
+ int receiver = request->dst;
#ifdef HAVE_TRACING
int rank = request->src;
TRACE_smpi_send(rank, rank, receiver,request->size);
}
#endif
-/* if(receiver == MPI_UNDEFINED) {*/
-/* XBT_WARN("Trying to send a message to a wrong rank");*/
-/* return;*/
-/* }*/
print_request("New send", request);
if (request->flags & RMA || request->size < sg_cfg_get_int("smpi/async_small_thres")) { // eager mode
- mailbox = smpi_process_remote_mailbox_small(receiver);
+ mailbox = smpi_process_remote_mailbox(receiver);
+ XBT_VERB("Is there a corresponding recv already posted in the large mailbox?");
+ smx_action_t action = simcall_comm_iprobe(mailbox, 1,request->dst, request->tag, &match_send, (void*)request);
+ if(action ==NULL){
+ XBT_VERB("No, nothing in the large mailbox, message is to be sent on the small one");
+ mailbox = smpi_process_remote_mailbox_small(receiver);
+ }else{
+ XBT_VERB("yes there was something for us in the other mailbox");
+ }
}else{
XBT_DEBUG("Send request %p is not in the permanent receive mailbox (buf: %p)",request,request->buf);
mailbox = smpi_process_remote_mailbox(receiver);
&& ((char*)request->buf >= start_data_exe)
&& ((char*)request->buf < start_data_exe + size_data_exe )){
XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment ");
- switch_data_segment(request->src);
+ smpi_switch_data_segment(request->src);
}
buf = xbt_malloc(request->size);
memcpy(buf,oldbuf,request->size);
request->real_size=request->size;
smpi_datatype_use(request->old_type);
smpi_comm_use(request->comm);
-
+ request->action =
+ simcall_comm_isend(SIMIX_process_from_PID(request->src+1), mailbox, request->size, -1.0,
+ buf, request->real_size,
+ &match_send,
+ &xbt_free_f, // how to free the userdata if a detached send fails
+ &smpi_comm_copy_buffer_callback,
+ request,
+ // detach if msg size < eager/rdv switch limit
+ request->detached);
//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
simcall_process_sleep(sleeptime);
XBT_DEBUG("sending size of %zu : sleep %f ", request->size, smpi_os(request->size));
}
- request->action =
- simcall_comm_isend(SIMIX_process_from_PID(request->src+1), mailbox, request->size, -1.0,
- buf, request->real_size,
- &match_send,
- &xbt_free_f, // how to free the userdata if a detached send fails
- &smpi_comm_copy_buffer_callback,
- request,
- // detach if msg size < eager/rdv switch limit
- request->detached);
+
#ifdef HAVE_TRACING
/* FIXME: detached sends are not traceable (request->action == NULL) */
&& ((char*)req->old_buf < start_data_exe + size_data_exe )
){
XBT_VERB("Privatization : We are unserializing to a zone in global memory - Switch data segment ");
- switch_data_segment(smpi_process_index());
+ smpi_switch_data_segment(smpi_process_index());
}
}
//assume that request is not MPI_REQUEST_NULL (filtered in PMPI_Test or smpi_mpi_testall before)
//to avoid deadlocks
- double sleeptime= sg_cfg_get_double("smpi/test");
//multiplier to the sleeptime, to increase speed of execution, each failed test will increase it
static int nsleeps = 1;
- simcall_process_sleep(nsleeps*sleeptime);
+ if(smpi_test_sleep > 0) simcall_process_sleep(nsleeps*smpi_test_sleep);
smpi_empty_status(status);
flag = 1;
}
}
if(size > 0) {
- //to avoid deadlocks
- double sleeptime= sg_cfg_get_double("smpi/test");
//multiplier to the sleeptime, to increase speed of execution, each failed testany will increase it
static int nsleeps = 1;
- simcall_process_sleep(nsleeps*sleeptime);
+ if(smpi_test_sleep > 0) simcall_process_sleep(nsleeps*smpi_test_sleep);
i = simcall_comm_testany(comms);
// not MPI_UNDEFINED, as this is a simix return code
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");
//multiplier to the sleeptime, to increase speed of execution, each failed iprobe will increase it
static int nsleeps = 1;
-
- simcall_process_sleep(nsleeps*sleeptime);
-
+ if(smpi_iprobe_sleep > 0) simcall_process_sleep(nsleeps*smpi_iprobe_sleep);
// behave like a receive, but don't do it
smx_rdv_t mailbox;
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);
+ request->action = simcall_comm_iprobe(mailbox, 0, request->src, request->tag, &match_recv, (void*)request);
}
if (request->action==NULL){
mailbox = smpi_process_mailbox();
XBT_DEBUG("trying to probe the other mailbox");
- request->action = simcall_comm_iprobe(mailbox, request->src, request->tag, &match_recv, (void*)request);
+ request->action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request);
}
if(request->action){
