X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e08b50479b9a8dc340b8bf143b38d48ac07a1fb7..12900371925594a27b91457d6db67020eb4df4e5:/src/smpi/smpi_base.c diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 30bb6ab31d..c75e51dabf 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -17,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)"); -static int match_recv(void* a, void* b, smx_action_t ignored) { +static int match_recv(void* a, void* b, smx_synchro_t ignored) { MPI_Request ref = (MPI_Request)a; MPI_Request req = (MPI_Request)b; XBT_DEBUG("Trying to match a recv of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag); @@ -39,7 +39,7 @@ static int match_recv(void* a, void* b, smx_action_t ignored) { }else return 0; } -static int match_send(void* a, void* b,smx_action_t ignored) { +static int match_send(void* a, void* b,smx_synchro_t ignored) { MPI_Request ref = (MPI_Request)a; MPI_Request req = (MPI_Request)b; XBT_DEBUG("Trying to match a send of src %d against %d, tag %d against %d",ref->src,req->src, ref->tag, req->tag); @@ -75,8 +75,6 @@ double smpi_wtime_sleep = 0.0; double smpi_iprobe_sleep = 1e-4; double smpi_test_sleep = 1e-4; -xbt_dict_t smpi_keyvals = NULL; -int keyval_id=MPI_TAG_UB+1;//avoid collisions // 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 @@ -252,10 +250,8 @@ static MPI_Request build_request(void *buf, int count, else request->refcount = 0; request->op = MPI_REPLACE; -#ifdef HAVE_TRACING request->send = 0; request->recv = 0; -#endif if (flags & SEND) smpi_datatype_unuse(datatype); return request; @@ -346,19 +342,22 @@ void smpi_mpi_start(MPI_Request request) if (request->flags & RECV) { print_request("New recv", request); + + xbt_mutex_t mut=smpi_process_mailboxes_mutex(); + xbt_mutex_acquire(mut); if (request->flags & RMA || request->size < sg_cfg_get_int("smpi/async_small_thres")){ //We have to check both mailboxes (because SSEND messages are sent to the large mbox). begin with the more appropriate one : the small one. mailbox = smpi_process_mailbox_small(); - XBT_DEBUG("Is there a corresponding send already posted the small mailbox %p (in case of SSEND)?", mailbox); - smx_action_t action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request); + XBT_DEBUG("Is there a corresponding send already posted in the small mailbox %p (in case of SSEND)?", mailbox); + smx_synchro_t action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request); if(action ==NULL){ mailbox = smpi_process_mailbox(); XBT_DEBUG("No, nothing in the small mailbox test the other one : %p", mailbox); action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request); if(action ==NULL){ - XBT_DEBUG("Still notching, switch back to the small mailbox : %p", mailbox); + XBT_DEBUG("Still nothing, switch back to the small mailbox : %p", mailbox); mailbox = smpi_process_mailbox_small(); } }else{ @@ -367,7 +366,7 @@ void smpi_mpi_start(MPI_Request request) }else{ mailbox = smpi_process_mailbox_small(); XBT_DEBUG("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); + smx_synchro_t action = simcall_comm_iprobe(mailbox, 0, request->src,request->tag, &match_recv, (void*)request); if(action ==NULL){ XBT_DEBUG("No, nothing in the permanent receive mailbox"); @@ -395,18 +394,16 @@ void smpi_mpi_start(MPI_Request request) request, -1.0); XBT_DEBUG("recv simcall posted"); - + xbt_mutex_release(mut); } else { int receiver = request->dst; - #ifdef HAVE_TRACING - int rank = request->src; - if (TRACE_smpi_view_internals()) { - TRACE_smpi_send(rank, rank, receiver,request->size); - } - #endif + int rank = request->src; + if (TRACE_smpi_view_internals()) { + TRACE_smpi_send(rank, rank, receiver,request->size); + } print_request("New send", request); //if we are giving back the control to the user without waiting for completion, we have to inject timings @@ -421,10 +418,13 @@ void smpi_mpi_start(MPI_Request request) XBT_DEBUG("sending size of %zu : sleep %f ", request->size, smpi_os(request->size)); } + xbt_mutex_t mut=smpi_process_remote_mailboxes_mutex(receiver); + xbt_mutex_acquire(mut); + if (request->flags & RMA || request->size < sg_cfg_get_int("smpi/async_small_thres")) { // eager mode mailbox = smpi_process_remote_mailbox(receiver); XBT_DEBUG("Is there a corresponding recv already posted in the large mailbox %p?", mailbox); - smx_action_t action = simcall_comm_iprobe(mailbox, 1,request->dst, request->tag, &match_send, (void*)request); + smx_synchro_t action = simcall_comm_iprobe(mailbox, 1,request->dst, request->tag, &match_send, (void*)request); if(action ==NULL){ if (! (request->flags & SSEND)){ mailbox = smpi_process_remote_mailbox_small(receiver); @@ -456,11 +456,11 @@ void smpi_mpi_start(MPI_Request request) oldbuf = request->buf; if (!smpi_process_get_replaying() && oldbuf && request->size!=0){ if((smpi_privatize_global_variables) - && ((char*)request->buf >= start_data_exe) - && ((char*)request->buf < start_data_exe + size_data_exe )){ + && ((char*) request->buf >= smpi_start_data_exe) + && ((char*)request->buf < smpi_start_data_exe + smpi_size_data_exe )){ XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment "); - smpi_switch_data_segment(request->src); - } + smpi_switch_data_segment(request->src); + } buf = xbt_malloc(request->size); memcpy(buf,oldbuf,request->size); XBT_DEBUG("buf %p copied into %p",oldbuf,buf); @@ -486,13 +486,11 @@ void smpi_mpi_start(MPI_Request request) -#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 + simcall_set_category(request->action, TRACE_internal_smpi_get_category()); + xbt_mutex_release(mut); } } @@ -696,8 +694,8 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) if((req->flags & ACCUMULATE) || (datatype->has_subtype == 1)){ if (!smpi_process_get_replaying()){ if( smpi_privatize_global_variables - && ((char*)req->old_buf >= start_data_exe) - && ((char*)req->old_buf < start_data_exe + size_data_exe ) + && ((char*)req->old_buf >= smpi_start_data_exe) + && ((char*)req->old_buf < smpi_start_data_exe + smpi_size_data_exe ) ){ XBT_VERB("Privatization : We are unserializing to a zone in global memory - Switch data segment "); smpi_switch_data_segment(smpi_process_index()); @@ -721,7 +719,6 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) } -#ifdef HAVE_TRACING if (TRACE_smpi_view_internals()) { if(req->flags & RECV){ int rank = smpi_process_index(); @@ -729,7 +726,6 @@ static void finish_wait(MPI_Request * request, MPI_Status * status) TRACE_smpi_recv(rank, src_traced, rank); } } -#endif if(req->detached_sender!=NULL){ smpi_mpi_request_free(&(req->detached_sender)); @@ -778,7 +774,7 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index, *index = MPI_UNDEFINED; flag = 0; - comms = xbt_dynar_new(sizeof(smx_action_t), NULL); + comms = xbt_dynar_new(sizeof(smx_synchro_t), NULL); map = xbt_new(int, count); size = 0; for(i = 0; i < count; i++) { @@ -907,10 +903,9 @@ void smpi_mpi_wait(MPI_Request * request, MPI_Status * status) 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) + + if((MC_is_active() || MC_record_replay_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); @@ -929,7 +924,7 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], index = MPI_UNDEFINED; if(count > 0) { // Wait for a request to complete - comms = xbt_dynar_new(sizeof(smx_action_t), NULL); + comms = xbt_dynar_new(sizeof(smx_synchro_t), NULL); map = xbt_new(int, count); size = 0; XBT_DEBUG("Wait for one of %d", count); @@ -995,7 +990,7 @@ int smpi_mpi_waitall(int count, MPI_Request requests[], } for(c = 0; c < count; c++) { - if (MC_is_active()) { + if (MC_is_active() || MC_record_replay_is_active()) { smpi_mpi_wait(&requests[c], pstat); index = c; } else { @@ -1589,71 +1584,3 @@ void smpi_mpi_exscan(void *sendbuf, void *recvbuf, int count, xbt_free(tmpbufs); xbt_free(requests); } - - -int smpi_keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state){ - - if(!smpi_keyvals) - smpi_keyvals = xbt_dict_new(); - - smpi_key_elem value = (smpi_key_elem) xbt_new0(s_smpi_mpi_key_elem_t,1); - - value->copy_fn=copy_fn; - value->delete_fn=delete_fn; - - *keyval = keyval_id; - - xbt_dict_set(smpi_keyvals,(const char*)keyval,(void*)value, NULL); - keyval_id++; - return MPI_SUCCESS; -} - -int smpi_keyval_free(int* keyval){ - smpi_key_elem elem = xbt_dict_get_or_null(smpi_keyvals, (const char*)keyval); - if(!elem) - return MPI_ERR_ARG; - xbt_dict_remove(smpi_keyvals, (const char*)keyval); - xbt_free(elem); - return MPI_SUCCESS; -} - -int smpi_attr_delete(MPI_Comm comm, int keyval){ - smpi_key_elem elem = xbt_dict_get_or_null(smpi_keyvals, (const char*)&keyval); - if(!elem) - return MPI_ERR_ARG; - if(elem->delete_fn!=MPI_NULL_DELETE_FN){ - void * value; - int flag; - if(smpi_attr_get(comm, keyval, &value, &flag)==MPI_SUCCESS){ - int ret = elem->delete_fn(comm, keyval, &value, &flag); - if(ret!=MPI_SUCCESS) return ret; - } - } - return smpi_comm_attr_delete(comm, keyval);; -} - -int smpi_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag){ - smpi_key_elem elem = xbt_dict_get_or_null(smpi_keyvals, (const char*)&keyval); - if(!elem) - return MPI_ERR_ARG; - return smpi_comm_attr_get(comm, keyval, attr_value, flag);; -} - -int smpi_attr_put(MPI_Comm comm, int keyval, void* attr_value){ - - if(!smpi_keyvals) - smpi_keyvals = xbt_dict_new(); - - smpi_key_elem elem = xbt_dict_get_or_null(smpi_keyvals, (const char*)&keyval); - if(!elem ) - return MPI_ERR_ARG; - int flag; - void* value; - smpi_attr_get(comm, keyval, &value, &flag); - if(flag){ - int ret = elem->delete_fn(comm, keyval, &value, &flag); - if(ret!=MPI_SUCCESS) return ret; - } - return smpi_comm_attr_put(comm, keyval, attr_value);; -} -