X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd44215340094b81407df96650bf5fd17854623b..09fe3bc07ad8fa514b0d38bcfcf5527ba4d7cae6:/src/smpi/smpi_global.cpp diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp index 4170805b3a..1e6fd35f05 100644 --- a/src/smpi/smpi_global.cpp +++ b/src/smpi/smpi_global.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -9,7 +8,6 @@ #include "private.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "simgrid/sg_config.h" -#include "smpi_mpi_dt_private.h" #include "src/kernel/activity/SynchroComm.hpp" #include "src/mc/mc_record.h" #include "src/mc/mc_replay.h" @@ -75,7 +73,6 @@ int process_count = 0; int smpi_universe_size = 0; int* index_to_process_data = nullptr; extern double smpi_total_benched_time; -extern xbt_dict_t smpi_type_keyvals; extern xbt_dict_t smpi_comm_keyvals; xbt_os_timer_t global_timer; MPI_Comm MPI_COMM_WORLD = MPI_COMM_UNINITIALIZED; @@ -83,6 +80,8 @@ MPI_Errhandler *MPI_ERRORS_RETURN = nullptr; MPI_Errhandler *MPI_ERRORS_ARE_FATAL = nullptr; MPI_Errhandler *MPI_ERRHANDLER_NULL = nullptr; +void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_comm_copy_buffer_callback; + #define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1) static char *get_mailbox_name(char *str, int index) @@ -133,7 +132,7 @@ void smpi_process_init(int *argc, char ***argv) data->instance_id = instance_id; data->replaying = false; - static_cast(proc->data)->data = data; + static_cast(proc->data)->data = data; if (*argc > 3) { memmove(&(*argv)[0], &(*argv)[2], sizeof(char *) * (*argc - 2)); @@ -226,7 +225,7 @@ int smpi_global_size() smpi_process_data_t smpi_process_data() { - MsgActorExt* msgExt = static_cast(SIMIX_process_self()->data); + simgrid::MsgActorExt* msgExt = static_cast(SIMIX_process_self()->data); return static_cast(msgExt->data); } @@ -350,9 +349,9 @@ MPI_Comm smpi_process_comm_self() { smpi_process_data_t data = smpi_process_data(); if(data->comm_self==MPI_COMM_NULL){ - MPI_Group group = smpi_group_new(1); - data->comm_self = smpi_comm_new(group, nullptr); - smpi_group_set_mapping(group, smpi_process_index(), 0); + MPI_Group group = new Group(1); + data->comm_self = new Comm(group, nullptr); + group->set_mapping(smpi_process_index(), 0); } return data->comm_self; @@ -382,10 +381,9 @@ int smpi_process_get_sampling() return data->sampling; } -void print_request(const char *message, MPI_Request request) +void smpi_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, size_t)) { - XBT_VERB("%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); + smpi_comm_copy_data_callback = callback; } void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t buff_size) @@ -400,7 +398,7 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !"); smpi_switch_data_segment( - (static_cast((static_cast(comm->src_proc->data)->data))->index)); + (static_cast((static_cast(comm->src_proc->data)->data))->index)); tmpbuff = static_cast(xbt_malloc(buff_size)); memcpy(tmpbuff, buff, buff_size); } @@ -409,7 +407,7 @@ void smpi_comm_copy_buffer_callback(smx_activity_t synchro, void *buff, size_t b && ((char*)comm->dst_buff < smpi_start_data_exe + smpi_size_data_exe )){ XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment"); smpi_switch_data_segment( - (static_cast((static_cast(comm->dst_proc->data)->data))->index)); + (static_cast((static_cast(comm->dst_proc->data)->data))->index)); } memcpy(comm->dst_buff, tmpbuff, buff_size); @@ -597,13 +595,13 @@ void smpi_global_init() //if the process was launched through smpirun script we generate a global mpi_comm_world //if not, we let MPI_COMM_NULL, and the comm world will be private to each mpi instance if(smpirun){ - group = smpi_group_new(process_count); - MPI_COMM_WORLD = smpi_comm_new(group, nullptr); + group = new Group(process_count); + MPI_COMM_WORLD = new Comm(group, nullptr); MPI_Attr_put(MPI_COMM_WORLD, MPI_UNIVERSE_SIZE, reinterpret_cast(process_count)); msg_bar_t bar = MSG_barrier_init(process_count); for (i = 0; i < process_count; i++) { - smpi_group_set_mapping(group, i, i); + group->set_mapping(i, i); process_data[i]->finalization_barrier = bar; } } @@ -615,17 +613,17 @@ void smpi_global_destroy() smpi_bench_destroy(); if (MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED){ - while (smpi_group_unuse(smpi_comm_group(MPI_COMM_WORLD)) > 0); + delete MPI_COMM_WORLD->group(); MSG_barrier_destroy(process_data[0]->finalization_barrier); }else{ smpi_deployment_cleanup_instances(); } for (int i = 0; i < count; i++) { if(process_data[i]->comm_self!=MPI_COMM_NULL){ - smpi_comm_destroy(process_data[i]->comm_self); + Comm::destroy(process_data[i]->comm_self); } if(process_data[i]->comm_intra!=MPI_COMM_NULL){ - smpi_comm_destroy(process_data[i]->comm_intra); + Comm::destroy(process_data[i]->comm_intra); } xbt_os_timer_free(process_data[i]->timer); xbt_mutex_destroy(process_data[i]->mailboxes_mutex); @@ -635,11 +633,11 @@ void smpi_global_destroy() process_data = nullptr; if (MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED){ - smpi_comm_cleanup_smp(MPI_COMM_WORLD); - smpi_comm_cleanup_attributes(MPI_COMM_WORLD); + MPI_COMM_WORLD->cleanup_smp(); + MPI_COMM_WORLD->cleanup_attributes(); if(smpi_coll_cleanup_callback!=nullptr) smpi_coll_cleanup_callback(); - xbt_free(MPI_COMM_WORLD); + delete MPI_COMM_WORLD; } MPI_COMM_WORLD = MPI_COMM_NULL; @@ -649,8 +647,6 @@ void smpi_global_destroy() } xbt_free(index_to_process_data); - if(smpi_type_keyvals!=nullptr) - xbt_dict_free(&smpi_type_keyvals); if(smpi_comm_keyvals!=nullptr) xbt_dict_free(&smpi_comm_keyvals); if(smpi_privatize_global_variables) @@ -701,14 +697,18 @@ static void smpi_init_logs(){ XBT_LOG_CONNECT(smpi_coll); XBT_LOG_CONNECT(smpi_colls); XBT_LOG_CONNECT(smpi_comm); + XBT_LOG_CONNECT(smpi_datatype); 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_memory); + XBT_LOG_CONNECT(smpi_op); XBT_LOG_CONNECT(smpi_pmpi); + XBT_LOG_CONNECT(smpi_request); XBT_LOG_CONNECT(smpi_replay); XBT_LOG_CONNECT(smpi_rma); + XBT_LOG_CONNECT(smpi_utils); } } @@ -808,7 +808,7 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[]) // parse the platform file: get the host list SIMIX_create_environment(argv[1]); - SIMIX_comm_set_copy_data_callback(&smpi_comm_copy_buffer_callback); + SIMIX_comm_set_copy_data_callback(smpi_comm_copy_data_callback); SIMIX_function_register_default(realmain); SIMIX_launch_application(argv[2]);