From: Christian Heinrich Date: Tue, 2 May 2017 09:08:55 +0000 (+0200) Subject: [SMPI] Ported smpi_deployment.cpp to C++ X-Git-Tag: v3.16~292 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cc60901ad15bda7d7a1cc716bf5e04d927d630fc?hp=6e4314faad8983fa73a1290048bf2281919b8ebc [SMPI] Ported smpi_deployment.cpp to C++ --- diff --git a/src/smpi/smpi_deployment.cpp b/src/smpi/smpi_deployment.cpp index fb7375a77e..898813267b 100644 --- a/src/smpi/smpi_deployment.cpp +++ b/src/smpi/smpi_deployment.cpp @@ -6,23 +6,45 @@ #include "private.h" #include "simgrid/msg.h" /* barrier */ +#include "simgrid/s4u.hpp" #include "src/smpi/SmpiHost.hpp" -#include "xbt/dict.h" #include "xbt/log.h" -#include "xbt/sysdep.h" -static xbt_dict_t smpi_instances = nullptr; -extern int process_count; -extern int* index_to_process_data; +namespace simgrid { +namespace smpi { +namespace app { + +class Instance { +public: + Instance(const char* name, int max_no_processes, int process_count, MPI_Comm comm, msg_bar_t finalization_barrier) + : name(name) + , size(max_no_processes) + , present_processes(0) + , index(process_count) + , comm_world(comm) + , finalization_barrier(finalization_barrier) + { + } -typedef struct s_smpi_mpi_instance{ const char* name; int size; int present_processes; - int index; + int index; // Badly named. This should be "no_processes_when_registering" ;) MPI_Comm comm_world; msg_bar_t finalization_barrier; -} s_smpi_mpi_instance_t; +}; +} +} +namespace s4u { +extern std::map host_list; +} +} + +using simgrid::smpi::app::Instance; + +static std::map smpi_instances; +extern int process_count; // How many processes have been allocated over all instances? +extern int* index_to_process_data; /** \ingroup smpi_simulation * \brief Registers a running instance of a MPI program. @@ -36,92 +58,66 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_ { SIMIX_function_register(name, code); - s_smpi_mpi_instance_t* instance = (s_smpi_mpi_instance_t*)xbt_malloc(sizeof(s_smpi_mpi_instance_t)); - static int already_called = 0; if (!already_called) { already_called = 1; - xbt_dynar_t hosts = MSG_hosts_as_dynar(); - unsigned int cursor; - void* h; - xbt_dynar_foreach(hosts, cursor, h) { - simgrid::s4u::Host* host = static_cast(h); + for (auto& item : simgrid::s4u::host_list) { + simgrid::s4u::Host* host = item.second; host->extension_set(new simgrid::smpi::SmpiHost(host)); } - xbt_dynar_free(&hosts); } - instance->name = name; - instance->size = num_processes; - instance->present_processes = 0; - instance->index = process_count; - instance->comm_world = MPI_COMM_NULL; - instance->finalization_barrier = MSG_barrier_init(num_processes); + Instance instance(name, num_processes, process_count, MPI_COMM_NULL, MSG_barrier_init(num_processes)); process_count+=num_processes; - if(smpi_instances==nullptr){ - smpi_instances = xbt_dict_new_homogeneous(xbt_free_f); - } - - - xbt_dict_set(smpi_instances, name, (void*)instance, nullptr); + smpi_instances.insert(std::pair(name, instance)); } //get the index of the process in the process_data array void smpi_deployment_register_process(const char* instance_id, int rank, int index) { - - if(smpi_instances==nullptr){//no instance registered, we probably used smpirun. + if (smpi_instances.empty()) { // no instance registered, we probably used smpirun. index_to_process_data[index]=index; return; } - s_smpi_mpi_instance_t* instance = - static_cast(xbt_dict_get_or_null(smpi_instances, instance_id)); - xbt_assert(instance, "Error, unknown instance %s", instance_id); + Instance& instance = smpi_instances.at(instance_id); - if(instance->comm_world == MPI_COMM_NULL){ - MPI_Group group = new simgrid::smpi::Group(instance->size); - instance->comm_world = new simgrid::smpi::Comm(group, nullptr); + if (instance.comm_world == MPI_COMM_NULL) { + MPI_Group group = new simgrid::smpi::Group(instance.size); + instance.comm_world = new simgrid::smpi::Comm(group, nullptr); } - instance->present_processes++; - index_to_process_data[index]=instance->index+rank; - instance->comm_world->group()->set_mapping(index, rank); + instance.present_processes++; + index_to_process_data[index] = instance.index + rank; + instance.comm_world->group()->set_mapping(index, rank); } //get the index of the process in the process_data array MPI_Comm* smpi_deployment_comm_world(const char* instance_id) { - if(smpi_instances==nullptr){//no instance registered, we probably used smpirun. + if (smpi_instances.empty()) { // no instance registered, we probably used smpirun. return nullptr; } - s_smpi_mpi_instance_t* instance = - static_cast(xbt_dict_get_or_null(smpi_instances, instance_id)); - xbt_assert(instance, "Error, unknown instance %s", instance_id); - return &instance->comm_world; + Instance& instance = smpi_instances.at(instance_id); + return &instance.comm_world; } msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id) { - if(smpi_instances==nullptr){//no instance registered, we probably used smpirun. + if (smpi_instances.empty()) { // no instance registered, we probably used smpirun. return nullptr; } - s_smpi_mpi_instance_t* instance = - static_cast(xbt_dict_get_or_null(smpi_instances, instance_id)); - xbt_assert(instance, "Error, unknown instance %s", instance_id); - return instance->finalization_barrier; + Instance& instance = smpi_instances.at(instance_id); + return instance.finalization_barrier; } void smpi_deployment_cleanup_instances(){ - xbt_dict_cursor_t cursor = nullptr; - s_smpi_mpi_instance_t* instance = nullptr; - char *name = nullptr; - xbt_dict_foreach(smpi_instances, cursor, name, instance) { - if(instance->comm_world!=MPI_COMM_NULL) - delete instance->comm_world->group(); - delete instance->comm_world; - MSG_barrier_destroy(instance->finalization_barrier); + for (auto& item : smpi_instances) { + Instance instance = item.second; + if (instance.comm_world != MPI_COMM_NULL) + delete instance.comm_world->group(); + delete instance.comm_world; + MSG_barrier_destroy(instance.finalization_barrier); } - xbt_dict_free(&smpi_instances); }