X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/def4685632b43bff625c85cb45be4acb91592d33..3c072dea92bbf0e4df46b1d8d56cd62e68883b33:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index bd66ffb33b..bef49b1db8 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -1,6 +1,7 @@ #include #include "private.h" +#include "smpi_mpi_dt_private.h" XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); @@ -17,6 +18,7 @@ void *smpi_request_new() request->buf = NULL; request->completed = 0; + request->consumed = 0; request->mutex = SIMIX_mutex_init(); request->cond = SIMIX_cond_init(); request->data = NULL; @@ -121,11 +123,18 @@ int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype, } return retval; } + /* FIXME: understand what they do and put the prototypes in a header file (live in smpi_base.c) */ -void smpi_mpi_land_func(void *a, void *b, int *length, MPI_Datatype * datatype); -void smpi_mpi_sum_func(void *a, void *b, int *length, MPI_Datatype * datatype); -void smpi_mpi_min_func(void *a, void *b, int *length, MPI_Datatype * datatype); -void smpi_mpi_max_func(void *a, void *b, int *length, MPI_Datatype * datatype); +void smpi_mpi_land_func(void *a, void *b, int *length, + MPI_Datatype * datatype); +void smpi_mpi_sum_func(void *a, void *b, int *length, + MPI_Datatype * datatype); +void smpi_mpi_prod_func(void *a, void *b, int *length, + MPI_Datatype * datatype); +void smpi_mpi_min_func(void *a, void *b, int *length, + MPI_Datatype * datatype); +void smpi_mpi_max_func(void *a, void *b, int *length, + MPI_Datatype * datatype); void smpi_global_init() { @@ -153,14 +162,14 @@ void smpi_global_init() smpi_message_free, smpi_message_reset); smpi_global->process_count = SIMIX_process_count(); - DEBUG1("There is %d processes",smpi_global->process_count); + DEBUG1("There is %d processes", smpi_global->process_count); // sender/receiver processes - smpi_global->main_processes = xbt_new(smx_process_t, smpi_global->process_count); + smpi_global->main_processes = + xbt_new(smx_process_t, smpi_global->process_count); // timers smpi_global->timer = xbt_os_timer_new(); - smpi_global->timer_mutex = SIMIX_mutex_init(); smpi_global->timer_cond = SIMIX_cond_init(); smpi_global->do_once_duration_nodes = NULL; @@ -186,20 +195,43 @@ void smpi_global_init() } // mpi datatypes - smpi_mpi_global->mpi_byte = xbt_new(s_smpi_mpi_datatype_t, 1); + smpi_mpi_global->mpi_byte = xbt_new(s_smpi_mpi_datatype_t, 1); /* we can think of it as a placeholder for value*/ smpi_mpi_global->mpi_byte->size = (size_t) 1; + smpi_mpi_global->mpi_byte->lb = (ptrdiff_t) 0; + smpi_mpi_global->mpi_byte->ub = smpi_mpi_global->mpi_byte->lb + smpi_mpi_global->mpi_byte->size; + smpi_mpi_global->mpi_byte->flags = DT_FLAG_BASIC; + + smpi_mpi_global->mpi_char = xbt_new(s_smpi_mpi_datatype_t, 1); + smpi_mpi_global->mpi_char->size = (size_t) 1; + smpi_mpi_global->mpi_char->lb = (ptrdiff_t) 0; //&(smpi_mpi_global->mpi_char); + smpi_mpi_global->mpi_char->ub = smpi_mpi_global->mpi_char->lb + smpi_mpi_global->mpi_char->size; + smpi_mpi_global->mpi_char->flags = DT_FLAG_BASIC; + smpi_mpi_global->mpi_int = xbt_new(s_smpi_mpi_datatype_t, 1); smpi_mpi_global->mpi_int->size = sizeof(int); + smpi_mpi_global->mpi_int->lb = (ptrdiff_t) 0; // &(smpi_mpi_global->mpi_int); + smpi_mpi_global->mpi_int->ub = smpi_mpi_global->mpi_int->lb + smpi_mpi_global->mpi_int->size; + smpi_mpi_global->mpi_int->flags = DT_FLAG_BASIC; + smpi_mpi_global->mpi_float = xbt_new(s_smpi_mpi_datatype_t, 1); smpi_mpi_global->mpi_float->size = sizeof(float); + smpi_mpi_global->mpi_float->lb = (ptrdiff_t) 0; // &(smpi_mpi_global->mpi_float); + smpi_mpi_global->mpi_float->ub = smpi_mpi_global->mpi_float->lb + smpi_mpi_global->mpi_float->size; + smpi_mpi_global->mpi_float->flags = DT_FLAG_BASIC; + smpi_mpi_global->mpi_double = xbt_new(s_smpi_mpi_datatype_t, 1); smpi_mpi_global->mpi_double->size = sizeof(double); + smpi_mpi_global->mpi_double->lb = (ptrdiff_t) 0; //&(smpi_mpi_global->mpi_float); + smpi_mpi_global->mpi_double->ub = smpi_mpi_global->mpi_double->lb + smpi_mpi_global->mpi_double->size; + smpi_mpi_global->mpi_double->flags = DT_FLAG_BASIC; // mpi operations smpi_mpi_global->mpi_land = xbt_new(s_smpi_mpi_op_t, 1); smpi_mpi_global->mpi_land->func = smpi_mpi_land_func; smpi_mpi_global->mpi_sum = xbt_new(s_smpi_mpi_op_t, 1); smpi_mpi_global->mpi_sum->func = smpi_mpi_sum_func; + smpi_mpi_global->mpi_prod = xbt_new(s_smpi_mpi_op_t, 1); + smpi_mpi_global->mpi_prod->func = smpi_mpi_prod_func; smpi_mpi_global->mpi_min = xbt_new(s_smpi_mpi_op_t, 1); smpi_mpi_global->mpi_min->func = smpi_mpi_min_func; smpi_mpi_global->mpi_max = xbt_new(s_smpi_mpi_op_t, 1); @@ -219,7 +251,6 @@ void smpi_global_destroy() xbt_mallocator_free(smpi_global->message_mallocator); xbt_os_timer_free(smpi_global->timer); - SIMIX_mutex_destroy(smpi_global->timer_mutex); SIMIX_cond_destroy(smpi_global->timer_cond); for (curr = smpi_global->do_once_duration_nodes; NULL != curr; curr = next) { @@ -240,12 +271,14 @@ void smpi_global_destroy() xbt_free(smpi_mpi_global->mpi_comm_world); xbt_free(smpi_mpi_global->mpi_byte); + xbt_free(smpi_mpi_global->mpi_char); xbt_free(smpi_mpi_global->mpi_int); xbt_free(smpi_mpi_global->mpi_double); xbt_free(smpi_mpi_global->mpi_float); xbt_free(smpi_mpi_global->mpi_land); xbt_free(smpi_mpi_global->mpi_sum); + xbt_free(smpi_mpi_global->mpi_prod); xbt_free(smpi_mpi_global->mpi_max); xbt_free(smpi_mpi_global->mpi_min); @@ -255,43 +288,45 @@ void smpi_global_destroy() int smpi_process_index() { - smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self()); + smpi_process_data_t pdata = + (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self()); return pdata->index; } smx_mutex_t smpi_process_mutex() { - smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self()); + smpi_process_data_t pdata = + (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self()); return pdata->mutex; } smx_cond_t smpi_process_cond() { - smpi_process_data_t pdata = (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self()); + smpi_process_data_t pdata = + (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self()); return pdata->cond; } -static void smpi_cfg_cb_host_speed(const char *name, int pos) { - smpi_global->reference_speed = xbt_cfg_get_double_at(_surf_cfg_set,name,pos); +static void smpi_cfg_cb_host_speed(const char *name, int pos) +{ + smpi_global->reference_speed = + xbt_cfg_get_double_at(_surf_cfg_set, name, pos); } int smpi_run_simulation(int *argc, char **argv) { - smx_cond_t cond = NULL; - smx_action_t action = NULL; - - xbt_fifo_t actions_failed = xbt_fifo_new(); - xbt_fifo_t actions_done = xbt_fifo_new(); - srand(SMPI_RAND_SEED); double default_reference_speed = 20000.0; - xbt_cfg_register(&_surf_cfg_set,"reference_speed","Power of the host running the simulation (in flop/s). Used to bench the operations.", - xbt_cfgelm_double,&default_reference_speed,1,1,smpi_cfg_cb_host_speed,NULL); + xbt_cfg_register(&_surf_cfg_set, "reference_speed", + "Power of the host running the simulation (in flop/s). Used to bench the operations.", + xbt_cfgelm_double, &default_reference_speed, 1, 1, + smpi_cfg_cb_host_speed, NULL); int default_display_timing = 0; - xbt_cfg_register(&_surf_cfg_set,"display_timing","Boolean indicating whether we should display the timing after simulation.", - xbt_cfgelm_int,&default_display_timing,1,1,NULL,NULL); + xbt_cfg_register(&_surf_cfg_set, "display_timing", + "Boolean indicating whether we should display the timing after simulation.", + xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, NULL); SIMIX_global_init(argc, argv); @@ -310,28 +345,12 @@ int smpi_run_simulation(int *argc, char **argv) fflush(stderr); SIMIX_init(); - while (SIMIX_solve(actions_done, actions_failed) != -1.0) { - while ((action = xbt_fifo_pop(actions_failed))) { - DEBUG1("** %s failed **", action->name); - while ((cond = xbt_fifo_pop(action->cond_list))) { - SIMIX_cond_broadcast(cond); - } - } - while ((action = xbt_fifo_pop(actions_done))) { - DEBUG1("** %s done **", action->name); - while ((cond = xbt_fifo_pop(action->cond_list))) { - SIMIX_cond_broadcast(cond); - } - } - } - + while (SIMIX_solve(NULL, NULL) != -1.0); + // FIXME: cleanup incomplete - xbt_fifo_free(actions_failed); - xbt_fifo_free(actions_done); - - if (xbt_cfg_get_int(_surf_cfg_set,"display_timing")) - INFO1("simulation time %g", SIMIX_get_clock()); + if (xbt_cfg_get_int(_surf_cfg_set, "display_timing")) + INFO1("simulation time %g", SIMIX_get_clock()); smpi_global_destroy(); SIMIX_clean();