X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a0b1f7cf8921843f639d0bdfe6969486fcdb2116..161952a2e609e28dfcf637b0127f315d4e0392b3:/src/smpi/smpi_global.c diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c index 290b7c533e..0616abdc19 100644 --- a/src/smpi/smpi_global.c +++ b/src/smpi/smpi_global.c @@ -68,6 +68,9 @@ void smpi_process_init(int *argc, char ***argv) if (argc && argv) { proc = SIMIX_process_self(); index = atoi((*argv)[1]); +#ifdef SMPI_F2C + smpi_current_rank = index; +#endif data = smpi_process_remote_data(index); simcall_process_set_data(proc, data); if (*argc > 2) { @@ -274,7 +277,7 @@ void print_request(const char *message, MPI_Request request) request->dst, request->tag, request->flags); } -static void SMPI_comm_copy_buffer_callback(smx_action_t comm, +static void smpi_comm_copy_buffer_callback(smx_action_t comm, void *buff, size_t buff_size) { XBT_DEBUG("Copy the data over"); @@ -297,7 +300,7 @@ void smpi_global_init(void) MPI_Group group; char name[MAILBOX_NAME_MAXLEN]; - SIMIX_comm_set_copy_data_callback(&SMPI_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++) { @@ -407,14 +410,15 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) XBT_LOG_CONNECT(smpi_base); XBT_LOG_CONNECT(smpi_bench); XBT_LOG_CONNECT(smpi_coll); + XBT_LOG_CONNECT(smpi_colls); XBT_LOG_CONNECT(smpi_comm); + XBT_LOG_CONNECT(smpi_dvfs); 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); XBT_LOG_CONNECT(smpi_replay); - XBT_LOG_CONNECT(smpi_colls); #ifdef HAVE_TRACING TRACE_global_init(&argc, argv);