X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d140762b2b9c8746cdd3b0680a7167867ba0ad9..b198d59656bf6bdd8684110edab4d97596aeee7a:/src/smpi/internals/smpi_process.cpp diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp index 451f3cf9d8..4b55a615b7 100644 --- a/src/smpi/internals/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -3,34 +3,30 @@ /* 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. */ +#include "smpi_process.hpp" #include "mc/mc.h" -#include "src/mc/mc_replay.h" -#include "src/msg/msg_private.h" -#include "src/simix/smx_private.h" -#include "private.h" #include "private.hpp" -#include "smpi_process.hpp" -#include "smpi_group.hpp" #include "smpi_comm.hpp" - +#include "smpi_group.hpp" +#include "src/mc/mc_replay.hpp" +#include "src/msg/msg_private.hpp" +#include "src/simix/smx_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)"); -//TODO : replace -extern simgrid::smpi::Process **process_data; extern int* index_to_process_data; #define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1) static char *get_mailbox_name(char *str, int index) { - snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", static_cast (sizeof(int) * 2), index); + snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", static_cast(sizeof(int) * 2), static_cast(index)); return str; } static char *get_mailbox_name_small(char *str, int index) { - snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", static_cast (sizeof(int) * 2), index); + snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", static_cast(sizeof(int) * 2), static_cast(index)); return str; } @@ -70,14 +66,15 @@ Process::Process(int index, msg_bar_t finalization_barrier) void Process::set_data(int index, int* argc, char*** argv) { char* instance_id = (*argv)[1]; - comm_world_ = smpi_deployment_comm_world(instance_id); - msg_bar_t bar = smpi_deployment_finalization_barrier(instance_id); - if (bar!=nullptr) // don't overwrite the default one - finalization_barrier_ = bar; + comm_world_ = smpi_deployment_comm_world(instance_id); + msg_bar_t barrier = smpi_deployment_finalization_barrier(instance_id); + if (barrier != nullptr) // don't overwrite the current one if the instance has none + finalization_barrier_ = barrier; instance_id_ = instance_id; - index_ = index; + index_ = index; - static_cast(SIMIX_process_self()->userdata)->data = this; + process_ = SIMIX_process_self(); + static_cast(process_->userdata)->data = this; if (*argc > 3) { memmove(&(*argv)[0], &(*argv)[2], sizeof(char *) * (*argc - 2)); @@ -89,8 +86,7 @@ void Process::set_data(int index, int* argc, char*** argv) argv_ = argv; // set the process attached to the mailbox mailbox_small_->setReceiver(simgrid::s4u::Actor::self()); - process_ = SIMIX_process_self(); - XBT_DEBUG("<%d> New process in the game: %p", index_, SIMIX_process_self()); + XBT_DEBUG("<%d> New process in the game: %p", index_, process_); } /** @brief Prepares the current process for termination. */ @@ -158,10 +154,8 @@ smx_actor_t Process::process(){ return process_; } - /** - * \brief Returns a structure that stores the location (filename + linenumber) - * of the last calls to MPI_* functions. + * \brief Returns a structure that stores the location (filename + linenumber) of the last calls to MPI_* functions. * * \see smpi_trace_set_call_location */ @@ -170,6 +164,16 @@ smpi_trace_call_location_t* Process::call_location() return &trace_call_loc_; } +void Process::set_privatized_region(smpi_privatization_region_t region) +{ + privatized_region_ = region; +} + +smpi_privatization_region_t Process::privatized_region() +{ + return privatized_region_; +} + int Process::index() { return index_; @@ -266,32 +270,38 @@ void Process::set_return_value(int val){ void Process::init(int *argc, char ***argv){ - if (process_data == nullptr){ - printf("SimGrid was not initialized properly before entering MPI_Init. Aborting, please check compilation process and use smpirun\n"); - exit(1); + if (smpi_process_count() == 0) { + xbt_die("SimGrid was not initialized properly before entering MPI_Init. Aborting, please check compilation process and use smpirun\n"); } if (argc != nullptr && argv != nullptr) { smx_actor_t proc = SIMIX_process_self(); proc->context->set_cleanup(&MSG_process_cleanup_from_SIMIX); - int index = proc->pid - 1; + int index = proc->pid - 1; // The maestro process has always ID 0 but we don't need that process here if(index_to_process_data == nullptr){ index_to_process_data=static_cast(xbt_malloc(SIMIX_process_count()*sizeof(int))); } char* instance_id = (*argv)[1]; - int rank = xbt_str_parse_int((*argv)[2], "Invalid rank: %s"); - smpi_deployment_register_process(instance_id, rank, index); + try { + int rank = std::stoi(std::string((*argv)[2])); + smpi_deployment_register_process(instance_id, rank, index); + } catch (std::invalid_argument& ia) { + throw std::invalid_argument(std::string("Invalid rank: ") + (*argv)[2]); + } + // cheinrich: I'm not sure what the impact of the SMPI_switch_data_segment on this call is. I moved + // this up here so that I can set the privatized region before the switch. + Process* process = smpi_process_remote(index); if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP){ - /* Now using segment index of the process */ + /* Now using the segment index of this process */ index = proc->segment_index; + process->set_privatized_region(smpi_init_global_memory_segment_process()); /* Done at the process's creation */ SMPI_switch_data_segment(index); } - Process* process = smpi_process_remote(index); process->set_data(index, argc, argv); } xbt_assert(smpi_process(),