X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a185bb60f4c7b77ebccc4948d17f0dc43a9d6a5..6d4434a0ebdb34758d95faec8b47088a3f760df2:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index cdbdc96c63..24e869c468 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -15,8 +15,6 @@ #include "simix/smx_private.h" -XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (kernel)"); @@ -29,6 +27,7 @@ typedef struct s_smpi_process_data { 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; @@ -36,6 +35,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) { @@ -67,7 +70,7 @@ void smpi_process_init(int *argc, char ***argv) (*argc)--; data->argc = argc; data->argv = argv; - data->mailbox_small->permanent_receiver=proc;// set the process attached to the mailbox + 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); } } @@ -90,6 +93,7 @@ void smpi_process_finalize(void) } } +#ifdef SMPI_F2C int smpi_process_argc(void) { smpi_process_data_t data = smpi_process_data(); @@ -119,11 +123,12 @@ 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) { @@ -135,6 +140,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; @@ -203,13 +219,27 @@ void print_request(const char *message, MPI_Request request) { 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(&smpi_comm_copy_data_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++) { @@ -237,6 +267,7 @@ 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++) { @@ -255,16 +286,16 @@ void smpi_global_destroy(void) /* Fortran specific stuff */ /* With smpicc, the following weak symbols are used */ /* With smpiff, the following weak symbols are replaced by those in libf2c */ -int __attribute__((weak)) xargc; -char** __attribute__((weak)) xargv; +int __attribute__((weak)) smpi_simulated_main(int argc, char** argv) { + xbt_die("Should not be in this smpi_simulated_main"); + return 1; +} int __attribute__((weak)) main(int argc, char** argv) { - xargc = argc; - xargv = argv; - return MAIN__(); + return MAIN__(smpi_simulated_main,argc,argv); } -int MAIN__(void) +int MAIN__(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]) { srand(SMPI_RAND_SEED); @@ -274,7 +305,8 @@ int MAIN__(void) } /* Connect log categories. See xbt/log.c */ - XBT_LOG_CONNECT(smpi); + 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 */ XBT_LOG_CONNECT(smpi_base); XBT_LOG_CONNECT(smpi_bench); XBT_LOG_CONNECT(smpi_coll); @@ -284,22 +316,23 @@ int MAIN__(void) 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(&xargc, xargv); + TRACE_global_init(&argc, argv); #endif - SIMIX_global_init(&xargc, xargv); + SIMIX_global_init(&argc, argv); #ifdef HAVE_TRACING TRACE_start(); #endif // parse the platform file: get the host list - SIMIX_create_environment(xargv[1]); + SIMIX_create_environment(argv[1]); - SIMIX_function_register_default(smpi_simulated_main); - SIMIX_launch_application(xargv[2]); + SIMIX_function_register_default(realmain); + SIMIX_launch_application(argv[2]); smpi_global_init(); @@ -307,12 +340,12 @@ int MAIN__(void) fflush(stdout); fflush(stderr); - if (MC_IS_ENABLED) + if (MC_is_active()) MC_modelcheck(); else SIMIX_run(); - if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing")) + if (surf_cfg_get_int("smpi/display_timing")) XBT_INFO("Simulation time: %g seconds.", SIMIX_get_clock()); smpi_global_destroy(); @@ -321,6 +354,5 @@ int MAIN__(void) TRACE_end(); #endif - SIMIX_clean(); return 0; }