X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55eb4a6777966d160968eb4bfeac1ffa9028ec24..5471e7257ff1a171b33234d6c08227f34a1ba029:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index 01f56e9ae0..585847b760 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -7,6 +7,7 @@ #include "private.h" #include "smpi_mpi_dt_private.h" #include "mc/mc.h" +#include "mc/mc_record.h" #include "xbt/replay.h" #include "surf/surf.h" #include "simix/smx_private.h" @@ -26,6 +27,7 @@ typedef struct s_smpi_process_data { char ***argv; smx_rdv_t mailbox; smx_rdv_t mailbox_small; + xbt_mutex_t mailboxes_mutex; xbt_os_timer_t timer; MPI_Comm comm_self; MPI_Comm comm_intra; @@ -42,8 +44,8 @@ typedef struct s_smpi_process_data { static smpi_process_data_t *process_data = NULL; int process_count = 0; int* index_to_process_data = NULL; - - +extern double smpi_total_benched_time; +xbt_os_timer_t global_timer; MPI_Comm MPI_COMM_WORLD = MPI_COMM_UNINITIALIZED; int MPI_UNIVERSE_SIZE; @@ -106,7 +108,6 @@ void smpi_process_init(int *argc, char ***argv) data->argv = argv; // set the process attached to the mailbox simcall_rdv_set_receiver(data->mailbox_small, proc); - XBT_DEBUG("<%d> New process in the game: %p", index, proc); if(smpi_privatize_global_variables){ @@ -135,7 +136,7 @@ void smpi_process_finalize(void) { // This leads to an explosion of the search graph // which cannot be reduced: - if(MC_is_active()) + if(MC_is_active() || MC_record_replay_is_active()) return; int index = smpi_process_index(); @@ -254,6 +255,12 @@ smx_rdv_t smpi_process_mailbox_small(void) return data->mailbox_small; } +xbt_mutex_t smpi_process_mailboxes_mutex(void) +{ + smpi_process_data_t data = smpi_process_data(); + return data->mailboxes_mutex; +} + smx_rdv_t smpi_process_remote_mailbox(int index) { smpi_process_data_t data = smpi_process_remote_data(index); @@ -267,6 +274,12 @@ smx_rdv_t smpi_process_remote_mailbox_small(int index) return data->mailbox_small; } +xbt_mutex_t smpi_process_remote_mailboxes_mutex(int index) +{ + smpi_process_data_t data = smpi_process_remote_data(index); + return data->mailboxes_mutex; +} + xbt_os_timer_t smpi_process_timer(void) { smpi_process_data_t data = smpi_process_data(); @@ -330,11 +343,10 @@ void print_request(const char *message, MPI_Request request) request->dst, request->tag, request->flags); } -void smpi_comm_copy_buffer_callback(smx_action_t comm, +void smpi_comm_copy_buffer_callback(smx_synchro_t comm, void *buff, size_t buff_size) { XBT_DEBUG("Copy the data over"); - if(_xbt_replay_is_active()) return; void* tmpbuff=buff; if((smpi_privatize_global_variables) @@ -374,7 +386,7 @@ void smpi_comm_copy_buffer_callback(smx_action_t comm, } -void smpi_comm_null_copy_buffer_callback(smx_action_t comm, +void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm, void *buff, size_t buff_size) { return; @@ -405,7 +417,10 @@ void smpi_global_init(void) char name[MAILBOX_NAME_MAXLEN]; int smpirun=0; - + if (!MC_is_active()) { + global_timer = xbt_os_timer_new(); + xbt_os_walltimer_start(global_timer); + } if (process_count == 0){ process_count = SIMIX_process_count(); smpirun=1; @@ -419,6 +434,7 @@ void smpi_global_init(void) 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(); if (MC_is_active()) MC_ignore_heap(process_data[i]->timer, xbt_os_timer_size()); @@ -472,6 +488,7 @@ void smpi_global_destroy(void) xbt_os_timer_free(process_data[i]->timer); simcall_rdv_destroy(process_data[i]->mailbox); simcall_rdv_destroy(process_data[i]->mailbox_small); + xbt_mutex_destroy(process_data[i]->mailboxes_mutex); xbt_free(process_data[i]); } xbt_free(process_data); @@ -533,51 +550,51 @@ static void smpi_init_logs(){ static void smpi_init_options(){ int gather_id = find_coll_description(mpi_coll_gather_description, - sg_cfg_get_string("smpi/gather")); + sg_cfg_get_string("smpi/gather"),"gather"); mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype, void *, int, MPI_Datatype, int, MPI_Comm)) mpi_coll_gather_description[gather_id].coll; int allgather_id = find_coll_description(mpi_coll_allgather_description, - sg_cfg_get_string("smpi/allgather")); + sg_cfg_get_string("smpi/allgather"),"allgather"); mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype, void *, int, MPI_Datatype, MPI_Comm)) mpi_coll_allgather_description[allgather_id].coll; int allgatherv_id = find_coll_description(mpi_coll_allgatherv_description, - sg_cfg_get_string("smpi/allgatherv")); + sg_cfg_get_string("smpi/allgatherv"),"allgatherv"); mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, void *, int *, int *, MPI_Datatype, MPI_Comm)) mpi_coll_allgatherv_description[allgatherv_id].coll; int allreduce_id = find_coll_description(mpi_coll_allreduce_description, - sg_cfg_get_string("smpi/allreduce")); + sg_cfg_get_string("smpi/allreduce"),"allreduce"); mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount, MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)) mpi_coll_allreduce_description[allreduce_id].coll; int alltoall_id = find_coll_description(mpi_coll_alltoall_description, - sg_cfg_get_string("smpi/alltoall")); + sg_cfg_get_string("smpi/alltoall"),"alltoall"); mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype, void *, int, MPI_Datatype, MPI_Comm)) mpi_coll_alltoall_description[alltoall_id].coll; int alltoallv_id = find_coll_description(mpi_coll_alltoallv_description, - sg_cfg_get_string("smpi/alltoallv")); + sg_cfg_get_string("smpi/alltoallv"),"alltoallv"); mpi_coll_alltoallv_fun = (int (*)(void *, int *, int *, MPI_Datatype, void *, int *, int *, MPI_Datatype, MPI_Comm)) mpi_coll_alltoallv_description[alltoallv_id].coll; int bcast_id = find_coll_description(mpi_coll_bcast_description, - sg_cfg_get_string("smpi/bcast")); + sg_cfg_get_string("smpi/bcast"),"bcast"); mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm com)) mpi_coll_bcast_description[bcast_id].coll; int reduce_id = find_coll_description(mpi_coll_reduce_description, - sg_cfg_get_string("smpi/reduce")); + sg_cfg_get_string("smpi/reduce"),"reduce"); mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm)) @@ -585,14 +602,14 @@ static void smpi_init_options(){ int reduce_scatter_id = find_coll_description(mpi_coll_reduce_scatter_description, - sg_cfg_get_string("smpi/reduce_scatter")); + sg_cfg_get_string("smpi/reduce_scatter"),"reduce_scatter"); mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts, MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)) mpi_coll_reduce_scatter_description[reduce_scatter_id].coll; int scatter_id = find_coll_description(mpi_coll_scatter_description, - sg_cfg_get_string("smpi/scatter")); + sg_cfg_get_string("smpi/scatter"),"scatter"); mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, @@ -600,7 +617,7 @@ static void smpi_init_options(){ mpi_coll_scatter_description[scatter_id].coll; int barrier_id = find_coll_description(mpi_coll_barrier_description, - sg_cfg_get_string("smpi/barrier")); + sg_cfg_get_string("smpi/barrier"),"barrier"); mpi_coll_barrier_fun = (int (*)(MPI_Comm comm)) mpi_coll_barrier_description[barrier_id].coll; @@ -652,13 +669,25 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) fflush(stdout); fflush(stderr); - if (MC_is_active()) + if (MC_is_active()) { MC_do_the_modelcheck_for_real(); - else + } else { + SIMIX_run(); - if (sg_cfg_get_boolean("smpi/display_timing")) - XBT_INFO("Simulation time: %g seconds.", SIMIX_get_clock()); + xbt_os_walltimer_stop(global_timer); + if (sg_cfg_get_boolean("smpi/display_timing")){ + double global_time = xbt_os_timer_elapsed(global_timer); + XBT_INFO("Simulated time: %g seconds. \n " + "The simulation took %g seconds (after parsing and platform setup)\n" + "%g seconds were actual computation of the application" + , SIMIX_get_clock(), global_time , smpi_total_benched_time); + + if (smpi_total_benched_time/global_time>=0.75) + XBT_INFO("More than 75%% of the time was spent inside the application code.\n" + "You may want to use sampling functions or trace replay to reduce this."); + } + } smpi_global_destroy();