X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/46448320f12d59d0a5efc015ec51ec6ebba525c6..9cf73cc09740865d0de90546a12b2e2d74cfaf6f:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index 263b191439..7047bcc99c 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -7,12 +7,12 @@ #include "private.h" #include "smpi_mpi_dt_private.h" #include "mc/mc.h" -#include "mc/mc_record.h" +#include "src/mc/mc_record.h" #include "xbt/replay.h" #include "surf/surf.h" -#include "simix/smx_private.h" +#include "src/simix/smx_private.h" #include "simgrid/sg_config.h" -#include "mc/mc_replay.h" +#include "src/mc/mc_replay.h" #include /* DBL_MAX */ #include @@ -396,7 +396,7 @@ void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm, static void smpi_check_options(){ //check correctness of MPI parameters - xbt_assert(sg_cfg_get_int("smpi/async_small_thres") <= + xbt_assert(sg_cfg_get_int("smpi/async_small_thresh") <= sg_cfg_get_int("smpi/send_is_detached_thres")); if (sg_cfg_is_default_value("smpi/running_power")) { @@ -431,20 +431,20 @@ void smpi_global_init(void) for (i = 0; i < process_count; i++) { process_data[i] = xbt_new(s_smpi_process_data_t, 1); //process_data[i]->index = i; - process_data[i]->argc = NULL; - process_data[i]->argv = NULL; + process_data[i]->argc = NULL; + process_data[i]->argv = NULL; 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]->mailboxes_mutex=xbt_mutex_init(); - process_data[i]->timer = xbt_os_timer_new(); + process_data[i]->mailboxes_mutex = xbt_mutex_init(); + process_data[i]->timer = xbt_os_timer_new(); 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; + 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; process_data[i]->finalization_barrier = NULL; } //if the process was launched through smpirun script