X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55e441525895975f97dbd27af2e2e909bb4ba651..748722f1738549a84e1b1c7e8f347b649213075d:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index 0072cda76e..03d06e1c30 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -28,6 +28,7 @@ typedef struct s_smpi_process_data { smx_rdv_t mailbox_small; xbt_os_timer_t timer; MPI_Comm comm_self; + MPI_Comm comm_intra; MPI_Comm* comm_world; void *data; /* user data */ int index; @@ -77,7 +78,7 @@ void smpi_process_init(int *argc, char ***argv) proc->context->cleanup_func=SIMIX_process_cleanup; char* instance_id = (*argv)[1]; int rank = atoi((*argv)[2]); - index = SIMIX_process_get_PID(proc) -1; + index = smpi_process_index_of_smx_process(proc); if(!index_to_process_data){ index_to_process_data=(int*)xbt_malloc(SIMIX_process_count()*sizeof(int)); @@ -94,8 +95,7 @@ void smpi_process_init(int *argc, char ***argv) simcall_process_set_data(proc, data); if (*argc > 3) { free((*argv)[1]); - free((*argv)[2]); - memmove(&(*argv)[1], &(*argv)[3], sizeof(char *) * (*argc - 3)); + memmove(&(*argv)[0], &(*argv)[2], sizeof(char *) * (*argc - 2)); (*argv)[(*argc) - 1] = NULL; (*argv)[(*argc) - 2] = NULL; } @@ -104,10 +104,11 @@ void smpi_process_init(int *argc, char ***argv) data->argv = argv; // set the process attached to the mailbox simcall_rdv_set_receiver(data->mailbox_small, proc); + XBT_DEBUG("<%d> New process in the game: %p", index, proc); if(smpi_privatize_global_variables){ - switch_data_segment(index); + smpi_switch_data_segment(index); } } @@ -119,7 +120,7 @@ void smpi_process_destroy(void) { int index = smpi_process_index(); if(smpi_privatize_global_variables){ - switch_data_segment(index); + smpi_switch_data_segment(index); } process_data[index_to_process_data[index]]->state = SMPI_FINALIZED; XBT_DEBUG("<%d> Process left the game", index); @@ -130,10 +131,14 @@ void smpi_process_destroy(void) */ void smpi_process_finalize(void) { + // This leads to an explosion of the search graph + // which cannot be reduced: + if(MC_is_active()) + return; + int index = smpi_process_index(); // wait for all pending asynchronous comms to finish xbt_barrier_wait(process_data[index_to_process_data[index]]->finalization_barrier); - } /** @@ -164,7 +169,7 @@ int smpi_process_initialized(void) void smpi_process_mark_as_initialized(void) { int index = smpi_process_index(); - if ((index != MPI_UNDEFINED) && (!process_data[index_to_process_data[index]]->state != SMPI_FINALIZED)) + if ((index != MPI_UNDEFINED) && (process_data[index_to_process_data[index]]->state != SMPI_FINALIZED)) process_data[index_to_process_data[index]]->state = SMPI_INITIALIZED; } @@ -277,6 +282,18 @@ MPI_Comm smpi_process_comm_self(void) return data->comm_self; } +MPI_Comm smpi_process_get_comm_intra(void) +{ + smpi_process_data_t data = smpi_process_data(); + return data->comm_intra; +} + +void smpi_process_set_comm_intra(MPI_Comm comm) +{ + smpi_process_data_t data = smpi_process_data(); + data->comm_intra = comm; +} + void smpi_process_set_sampling(int s) { smpi_process_data_t data = smpi_process_data(); @@ -289,9 +306,10 @@ int smpi_process_get_sampling(void) return data->sampling; } + void print_request(const char *message, MPI_Request request) { - XBT_DEBUG + XBT_VERB ("%s request %p [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]", message, request, request->buf, request->size, request->src, request->dst, request->tag, request->flags); @@ -309,7 +327,7 @@ void smpi_comm_copy_buffer_callback(smx_action_t comm, && ((char*)buff < start_data_exe + size_data_exe ) ){ XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !"); - switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.src_proc))->index); + smpi_switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.src_proc))->index); tmpbuff = (void*)xbt_malloc(buff_size); memcpy(tmpbuff, buff, buff_size); } @@ -320,7 +338,7 @@ void smpi_comm_copy_buffer_callback(smx_action_t comm, && ((char*)comm->comm.dst_buff < start_data_exe + size_data_exe ) ){ XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment"); - switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.dst_proc))->index); + smpi_switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.dst_proc))->index); } @@ -350,7 +368,7 @@ static void smpi_check_options(){ XBT_INFO("You did not set the power of the host running the simulation. " "The timings will certainly not be accurate. " "Use the option \"--cfg=smpi/running_power:\" to set its value." - "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information. "); + "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information."); } } @@ -383,6 +401,7 @@ void smpi_global_init(void) if (MC_is_active()) MC_ignore_heap(process_data[i]->timer, xbt_os_timer_size()); process_data[i]->comm_self = MPI_COMM_NULL; + process_data[i]->comm_intra = MPI_COMM_NULL; process_data[i]->comm_world = NULL; process_data[i]->state = SMPI_UNINITIALIZED; process_data[i]->sampling = 0; @@ -424,6 +443,10 @@ void smpi_global_destroy(void) smpi_group_unuse(smpi_comm_group(process_data[i]->comm_self)); smpi_comm_destroy(process_data[i]->comm_self); } + if(process_data[i]->comm_intra!=MPI_COMM_NULL){ + smpi_group_unuse(smpi_comm_group(process_data[i]->comm_intra)); + smpi_comm_destroy(process_data[i]->comm_intra); + } xbt_os_timer_free(process_data[i]->timer); simcall_rdv_destroy(process_data[i]->mailbox); simcall_rdv_destroy(process_data[i]->mailbox_small); @@ -481,6 +504,7 @@ static void smpi_init_logs(){ XBT_LOG_CONNECT(smpi_mpi_dt); XBT_LOG_CONNECT(smpi_pmpi); XBT_LOG_CONNECT(smpi_replay); + XBT_LOG_CONNECT(smpi_rma); } @@ -587,14 +611,14 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) SIMIX_global_init(&argc, argv); + smpi_init_options(); + // parse the platform file: get the host list SIMIX_create_environment(argv[1]); SIMIX_comm_set_copy_data_callback(&smpi_comm_copy_buffer_callback); SIMIX_function_register_default(realmain); SIMIX_launch_application(argv[2]); - smpi_init_options(); - smpi_global_init(); smpi_check_options();