X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c8ede40c4f5e920bd12b2e4ede74db2892e0d60..ccedb07575381e28a3143247e9028fe4f73bcd96:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index bd5a5f1e0e..95d44578c6 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -5,14 +5,15 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include +#include #include #include "private.h" #include "smpi_mpi_dt_private.h" #include "mc/mc.h" #include "surf/surf.h" +#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)"); @@ -22,9 +23,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; @@ -39,6 +42,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; @@ -49,7 +57,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)); @@ -58,7 +66,8 @@ void smpi_process_init(int *argc, char ***argv) (*argc)--; data->argc = argc; data->argv = argv; - DEBUG2("<%d> New process in the game: %p", index, proc); + 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); } } @@ -66,7 +75,18 @@ void smpi_process_destroy(void) { int index = smpi_process_index(); - DEBUG1("<%d> Process left the game", index); + 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); + } } int smpi_process_argc(void) { @@ -75,6 +95,7 @@ int smpi_process_argc(void) { return data->argc ? *(data->argc) - 1 : 0; } +#ifdef SMPI_F2C int smpi_process_getarg(integer* index, char* dst, ftnlen len) { smpi_process_data_t data = smpi_process_data(); char* arg; @@ -93,19 +114,21 @@ int smpi_process_getarg(integer* index, char* dst, ftnlen len) { } return 0; } +#endif int smpi_global_size(void) { char* value = getenv("SMPI_GLOBAL_SIZE"); if(!value) { - abort(); + fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n"); + xbt_abort(); } return atoi(value); } 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) @@ -113,6 +136,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; @@ -131,12 +165,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(); @@ -144,42 +191,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) -{ - DEBUG8("%s request %p [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]", +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++) { @@ -187,7 +243,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); @@ -211,11 +268,14 @@ void smpi_global_destroy(void) 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 */ @@ -230,27 +290,44 @@ int __attribute__((weak)) main(int argc, char** argv) { return MAIN__(); } +#ifdef WIN32 +#include + +int __attribute__((weak)) smpi_simulated_main(int argc, char** argv) { + xbt_die("Should not be in this smpi_simulated_main"); + return 1; +} + +/* TODO FOR WIN32 */ +/* Dummy prototype to make gcc happy */ +int APIENTRY WinMain(HINSTANCE hInst,HINSTANCE hInst2,LPSTR lpstr01,int nCmdShow) +{ + return MAIN__(); +} + +#endif + int MAIN__(void) { 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); + 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; + } - 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); + /* 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 */ + 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); #ifdef HAVE_TRACING TRACE_global_init(&xargc, xargv); @@ -259,13 +336,13 @@ int MAIN__(void) SIMIX_global_init(&xargc, xargv); #ifdef HAVE_TRACING - TRACE_smpi_start(); + TRACE_start(); #endif // parse the platform file: get the host list SIMIX_create_environment(xargv[1]); - SIMIX_function_register("smpi_simulated_main", smpi_simulated_main); + SIMIX_function_register_default(smpi_simulated_main); SIMIX_launch_application(xargv[2]); smpi_global_init(); @@ -274,20 +351,19 @@ 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")) - INFO1("simulation time %g", SIMIX_get_clock()); + 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; }