X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8138044ce3ba946c574a0c3f9e7b7f61e52beb6e..c8c6d0ade908d7787bda1c278511c3e404097671:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index ad839cbbf5..22f52d734e 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -12,8 +12,9 @@ #include "smpi_mpi_dt_private.h" #include "mc/mc.h" #include "surf/surf.h" +#include "simix/smx_private.h" +#include "simgrid/sg_config.h" -XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (kernel)"); @@ -23,9 +24,11 @@ typedef struct s_smpi_process_data { int* argc; char*** argv; smx_rdv_t mailbox; + smx_rdv_t mailbox_small; xbt_os_timer_t timer; double simulated; MPI_Comm comm_self; + void *data; /* user data */ } s_smpi_process_data_t; static smpi_process_data_t *process_data = NULL; @@ -33,6 +36,10 @@ static int process_count = 0; MPI_Comm MPI_COMM_WORLD = MPI_COMM_NULL; +MPI_Errhandler* MPI_ERRORS_RETURN = NULL; +MPI_Errhandler* MPI_ERRORS_ARE_FATAL = NULL; +MPI_Errhandler* MPI_ERRHANDLER_NULL = NULL; + #define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1) static char* get_mailbox_name(char* str, int index) { @@ -40,6 +47,11 @@ static char* get_mailbox_name(char* str, int index) { return str; } +static char* get_mailbox_name_small(char* str, int index) { + snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", (int)(sizeof(int) * 2), index); + return str; +} + void smpi_process_init(int *argc, char ***argv) { int index; @@ -50,7 +62,7 @@ void smpi_process_init(int *argc, char ***argv) proc = SIMIX_process_self(); index = atoi((*argv)[1]); data = smpi_process_remote_data(index); - SIMIX_req_process_set_data(proc, data); + simcall_process_set_data(proc, data); if (*argc > 2) { free((*argv)[1]); memmove(&(*argv)[1], &(*argv)[2], sizeof(char *) * (*argc - 2)); @@ -59,6 +71,7 @@ void smpi_process_init(int *argc, char ***argv) (*argc)--; data->argc = argc; data->argv = argv; + simcall_rdv_set_receiver(data->mailbox_small, proc);// set the process attached to the mailbox XBT_DEBUG("<%d> New process in the game: %p", index, proc); } } @@ -70,6 +83,18 @@ void smpi_process_destroy(void) XBT_DEBUG("<%d> Process left the game", index); } +/** + * @brief Prepares the current process for termination. + */ +void smpi_process_finalize(void) +{ + // wait for all pending asynchronous comms to finish + while (SIMIX_process_has_pending_comms(SIMIX_process_self())) { + simcall_process_sleep(0.01); + } +} + +#ifdef SMPI_F2C int smpi_process_argc(void) { smpi_process_data_t data = smpi_process_data(); @@ -99,15 +124,16 @@ int smpi_global_size(void) { char* value = getenv("SMPI_GLOBAL_SIZE"); if(!value) { - fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n"); - abort(); + fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n"); + xbt_abort(); } return atoi(value); } +#endif smpi_process_data_t smpi_process_data(void) { - return SIMIX_process_self_get_data(); + return SIMIX_process_self_get_data(SIMIX_process_self()); } smpi_process_data_t smpi_process_remote_data(int index) @@ -115,6 +141,17 @@ smpi_process_data_t smpi_process_remote_data(int index) return process_data[index]; } +void smpi_process_set_user_data(void *data) +{ + smpi_process_data_t process_data = smpi_process_data(); + process_data->data = data; +} + +void* smpi_process_get_user_data(){ + smpi_process_data_t process_data = smpi_process_data(); + return process_data->data; +} + int smpi_process_count(void) { return process_count; @@ -133,12 +170,25 @@ smx_rdv_t smpi_process_mailbox(void) { return data->mailbox; } +smx_rdv_t smpi_process_mailbox_small(void) { + smpi_process_data_t data = smpi_process_data(); + + return data->mailbox_small; +} + smx_rdv_t smpi_process_remote_mailbox(int index) { smpi_process_data_t data = smpi_process_remote_data(index); return data->mailbox; } + +smx_rdv_t smpi_process_remote_mailbox_small(int index) { + smpi_process_data_t data = smpi_process_remote_data(index); + + return data->mailbox_small; +} + xbt_os_timer_t smpi_process_timer(void) { smpi_process_data_t data = smpi_process_data(); @@ -146,42 +196,51 @@ xbt_os_timer_t smpi_process_timer(void) return data->timer; } -void smpi_process_simulated_start(void) -{ +void smpi_process_simulated_start(void) { smpi_process_data_t data = smpi_process_data(); data->simulated = SIMIX_get_clock(); } -double smpi_process_simulated_elapsed(void) -{ +double smpi_process_simulated_elapsed(void) { smpi_process_data_t data = smpi_process_data(); return SIMIX_get_clock() - data->simulated; } -MPI_Comm smpi_process_comm_self(void) -{ +MPI_Comm smpi_process_comm_self(void) { smpi_process_data_t data = smpi_process_data(); return data->comm_self; } -void print_request(const char *message, MPI_Request request) -{ +void print_request(const char *message, MPI_Request request) { XBT_DEBUG("%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); } +static void SMPI_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size) +{ + XBT_DEBUG("Copy the data over"); + memcpy(comm->comm.dst_buff, buff, buff_size); + if (comm->comm.detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the original buffer available to the application ASAP + xbt_free(buff); + //It seems that the request is used after the call there this should + //be free somewhereelse but where??? + //xbt_free(comm->comm.src_data);// inside SMPI the request is keep + //inside the user data and should be free + comm->comm.src_buff = NULL; + } +} + void smpi_global_init(void) { int i; MPI_Group group; char name[MAILBOX_NAME_MAXLEN]; - SIMIX_comm_set_copy_data_callback - (&SIMIX_comm_copy_buffer_callback); + SIMIX_comm_set_copy_data_callback(&SMPI_comm_copy_buffer_callback); process_count = SIMIX_process_count(); process_data = xbt_new(smpi_process_data_t, process_count); for (i = 0; i < process_count; i++) { @@ -189,7 +248,8 @@ void smpi_global_init(void) process_data[i]->index = i; process_data[i]->argc = NULL; process_data[i]->argv = NULL; - process_data[i]->mailbox = SIMIX_req_rdv_create(get_mailbox_name(name, i)); + process_data[i]->mailbox = simcall_rdv_create(get_mailbox_name(name, i)); + process_data[i]->mailbox_small = simcall_rdv_create(get_mailbox_name_small(name, i)); process_data[i]->timer = xbt_os_timer_new(); group = smpi_group_new(1); process_data[i]->comm_self = smpi_comm_new(group); @@ -208,16 +268,20 @@ void smpi_global_destroy(void) int i; smpi_bench_destroy(); + smpi_group_destroy(smpi_comm_group(MPI_COMM_WORLD)); smpi_comm_destroy(MPI_COMM_WORLD); MPI_COMM_WORLD = MPI_COMM_NULL; for (i = 0; i < count; i++) { smpi_comm_destroy(process_data[i]->comm_self); xbt_os_timer_free(process_data[i]->timer); - SIMIX_req_rdv_destroy(process_data[i]->mailbox); + simcall_rdv_destroy(process_data[i]->mailbox); + simcall_rdv_destroy(process_data[i]->mailbox_small); xbt_free(process_data[i]); } xbt_free(process_data); process_data = NULL; + + smpi_free_static(); } /* Fortran specific stuff */ @@ -226,53 +290,73 @@ void smpi_global_destroy(void) int __attribute__((weak)) xargc; char** __attribute__((weak)) xargv; +#ifndef WIN32 +void __attribute__((weak)) user_main__(){ + xbt_die("Should not be in this smpi_simulated_main"); + return; +} +int __attribute__((weak)) smpi_simulated_main__(int argc, char** argv) { + smpi_process_init(&argc, &argv); + user_main__(); + //xbt_die("Should not be in this smpi_simulated_main"); + return 0; +} + int __attribute__((weak)) main(int argc, char** argv) { - xargc = argc; - xargv = argv; - return MAIN__(); + return smpi_main(smpi_simulated_main__,argc,argv); } -int MAIN__(void) +int __attribute__((weak)) MAIN__(){ + return smpi_main(smpi_simulated_main__,xargc, xargv); +}; +#endif + +int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]) { srand(SMPI_RAND_SEED); - double default_reference_speed = 20000.0; - xbt_cfg_register(&_surf_cfg_set, "smpi/running_power", - "Power of the host running the simulation (in flop/s). Used to bench the operations.", - xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL, - NULL); - - int default_display_timing = 0; - xbt_cfg_register(&_surf_cfg_set, "smpi/display_timing", - "Boolean indicating whether we should display the timing after simulation.", - xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, - NULL); - - double default_threshold = 1e-6; - xbt_cfg_register(&_surf_cfg_set, "smpi/cpu_threshold", - "Minimal computation time (in seconds) not discarded.", - xbt_cfgelm_double, &default_threshold, 1, 1, NULL, - NULL); - if(getenv("SMPI_PRETEND_CC") != NULL) { + /* Hack to ensure that smpicc can pretend to be a simple compiler. Particularly handy to pass it to the configuration tools */ return 0; } + /* Connect log categories. See xbt/log.c */ + XBT_LOG_CONNECT(smpi); /* Keep this line as soon as possible in this + function: xbt_log_appender_file.c depends on it + DO NOT connect this in XBT or so, or it will be + useless to xbt_log_appender_file.c */ #ifdef HAVE_TRACING - TRACE_global_init(&xargc, xargv); + XBT_LOG_CONNECT(instr_smpi); +#endif + XBT_LOG_CONNECT(smpi_base); + XBT_LOG_CONNECT(smpi_bench); + XBT_LOG_CONNECT(smpi_coll); + XBT_LOG_CONNECT(smpi_comm); + XBT_LOG_CONNECT(smpi_group); + XBT_LOG_CONNECT(smpi_kernel); + XBT_LOG_CONNECT(smpi_mpi); + XBT_LOG_CONNECT(smpi_mpi_dt); + XBT_LOG_CONNECT(smpi_pmpi); + XBT_LOG_CONNECT(smpi_replay); + +#ifdef HAVE_TRACING + TRACE_global_init(&argc, argv); + + TRACE_add_start_function(TRACE_smpi_alloc); + TRACE_add_end_function(TRACE_smpi_release); #endif - SIMIX_global_init(&xargc, xargv); + SIMIX_global_init(&argc, argv); #ifdef HAVE_TRACING - TRACE_smpi_start(); + TRACE_start(); #endif // parse the platform file: get the host list - SIMIX_create_environment(xargv[1]); + SIMIX_create_environment(argv[1]); - SIMIX_function_register("smpi_simulated_main", smpi_simulated_main); - SIMIX_launch_application(xargv[2]); + SIMIX_function_register_default(realmain); + SIMIX_launch_application(argv[2]); smpi_global_init(); @@ -280,20 +364,19 @@ int MAIN__(void) fflush(stdout); fflush(stderr); - if (MC_IS_ENABLED) - MC_modelcheck(); + if (MC_is_active()) + MC_modelcheck_safety(); else SIMIX_run(); - if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing")) - XBT_INFO("simulation time %g", SIMIX_get_clock()); + if (sg_cfg_get_int("smpi/display_timing")) + XBT_INFO("Simulation time: %g seconds.", SIMIX_get_clock()); smpi_global_destroy(); #ifdef HAVE_TRACING - TRACE_smpi_release(); + TRACE_end(); #endif - SIMIX_clean(); return 0; }