From: Arnaud Giersch Date: Mon, 19 Apr 2021 19:08:54 +0000 (+0200) Subject: More int -> aid_t. X-Git-Tag: v3.28~448 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1b026ccb35d517964a3c60f31cf2297b5c75b4c0 More int -> aid_t. --- diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 26e4e96dfb..7281ab22d1 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -63,7 +63,7 @@ int PMPI_Init(int*, char***) int PMPI_Finalize() { smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 2ec4b0e84b..0965e9e968 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -98,7 +98,7 @@ public: { for (auto const& pair : store) { auto& req = pair.second; - auto my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); if (req != MPI_REQUEST_NULL && (req->src() == my_proc_id || req->dst() == my_proc_id)) { vec.push_back(pair.second); pair.second->print_request("MM"); diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index c1226526b0..84ffe79555 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -12,7 +12,7 @@ #include "src/smpi/include/smpi_actor.hpp" #include "src/surf/HostImpl.hpp" -#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)"); @@ -369,11 +369,11 @@ void Comm::unref(Comm* comm){ MPI_Comm Comm::find_intra_comm(int * leader){ //get the indices of all processes sharing the same simix host int intra_comm_size = 0; - int min_index = INT_MAX; // the minimum index will be the leader + aid_t min_index = std::numeric_limits::max(); // the minimum index will be the leader sg_host_self()->get_impl()->foreach_actor([this, &intra_comm_size, &min_index](auto& actor) { - if (this->group()->rank(actor.get_pid()) != MPI_UNDEFINED) { // Is this process in the current group? + aid_t index = actor.get_pid(); + if (this->group()->rank(index) != MPI_UNDEFINED) { // Is this process in the current group? intra_comm_size++; - int index = actor.get_pid(); if (index < min_index) min_index = index; } diff --git a/src/smpi/plugins/ampi/ampi.cpp b/src/smpi/plugins/ampi/ampi.cpp index ee73975b60..40bab092d8 100644 --- a/src/smpi/plugins/ampi/ampi.cpp +++ b/src/smpi/plugins/ampi/ampi.cpp @@ -30,7 +30,7 @@ extern "C" void* _sampi_malloc(size_t size) extern "C" void _sampi_free(void* ptr) { size_t alloc_size = alloc_table.at(ptr); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); memory_size[my_proc_id] -= alloc_size; xbt_free(ptr); } @@ -91,7 +91,7 @@ int APMPI_Iteration_out(MPI_Comm comm) void APMPI_Migrate(MPI_Comm comm) { smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_migration_call(comm->rank() + 1, new simgrid::instr::AmpiMigrateTIData(memory_size[my_proc_id])); smpi_bench_begin(); } diff --git a/src/smpi/plugins/ampi/instr_ampi.cpp b/src/smpi/plugins/ampi/instr_ampi.cpp index 4015ef48dc..99fa0da047 100644 --- a/src/smpi/plugins/ampi/instr_ampi.cpp +++ b/src/smpi/plugins/ampi/instr_ampi.cpp @@ -12,33 +12,33 @@ static const std::map> ampi_colors = {{"migrate", "0.2 0.5 0.2"}, {"iteration", "0.5 0.5 0.5"}}; -void TRACE_Iteration_in(int rank, simgrid::instr::TIData* extra) +void TRACE_Iteration_in(aid_t pid, simgrid::instr::TIData* extra) { if (not TRACE_smpi_is_enabled()) { delete extra; return; } - smpi_container(rank)->get_state("MPI_STATE")->add_entity_value("iteration", ampi_colors.at("iteration")); - smpi_container(rank)->get_state("MPI_STATE")->push_event("iteration", extra); + smpi_container(pid)->get_state("MPI_STATE")->add_entity_value("iteration", ampi_colors.at("iteration")); + smpi_container(pid)->get_state("MPI_STATE")->push_event("iteration", extra); } -void TRACE_Iteration_out(int rank, simgrid::instr::TIData* extra) +void TRACE_Iteration_out(aid_t pid, simgrid::instr::TIData* extra) { if (not TRACE_smpi_is_enabled()) return; - smpi_container(rank)->get_state("MPI_STATE")->pop_event(extra); + smpi_container(pid)->get_state("MPI_STATE")->pop_event(extra); } -void TRACE_migration_call(int rank, simgrid::instr::TIData* extra) +void TRACE_migration_call(aid_t pid, simgrid::instr::TIData* extra) { if (not TRACE_smpi_is_enabled()) return; const std::string operation = "migrate"; if(smpi_process()->replaying()) {//When replaying, we register an event. - smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value(operation); + smpi_container(pid)->get_state("MIGRATE_STATE")->add_entity_value(operation); - auto* type = static_cast(smpi_container(rank)->type_->by_name(operation)); - new simgrid::instr::NewEvent(smpi_process()->simulated_elapsed(), smpi_container(rank), type, + auto* type = static_cast(smpi_container(pid)->type_->by_name(operation)); + new simgrid::instr::NewEvent(smpi_process()->simulated_elapsed(), smpi_container(pid), type, type->get_entity_value(operation)); } else { // FIXME From rktesser: Ugly workaround! @@ -49,8 +49,8 @@ void TRACE_migration_call(int rank, simgrid::instr::TIData* extra) delete extra; return; } - smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value(operation, ampi_colors.at(operation)); - smpi_container(rank)->get_state("MIGRATE_STATE")->push_event(operation, extra); - smpi_container(rank)->get_state("MIGRATE_STATE")->pop_event(); + smpi_container(pid)->get_state("MIGRATE_STATE")->add_entity_value(operation, ampi_colors.at(operation)); + smpi_container(pid)->get_state("MIGRATE_STATE")->push_event(operation, extra); + smpi_container(pid)->get_state("MIGRATE_STATE")->pop_event(); } } diff --git a/src/smpi/plugins/ampi/instr_ampi.hpp b/src/smpi/plugins/ampi/instr_ampi.hpp index 9c6002e519..2328453416 100644 --- a/src/smpi/plugins/ampi/instr_ampi.hpp +++ b/src/smpi/plugins/ampi/instr_ampi.hpp @@ -9,8 +9,8 @@ #include "smpi/smpi.h" #include "src/instr/instr_private.hpp" -XBT_PRIVATE void TRACE_Iteration_in(int rank, simgrid::instr::TIData* extra); -XBT_PRIVATE void TRACE_Iteration_out(int rank, simgrid::instr::TIData* extra); -XBT_PRIVATE void TRACE_migration_call(int rank, simgrid::instr::TIData* extra); +XBT_PRIVATE void TRACE_Iteration_in(aid_t pid, simgrid::instr::TIData* extra); +XBT_PRIVATE void TRACE_Iteration_out(aid_t pid, simgrid::instr::TIData* extra); +XBT_PRIVATE void TRACE_migration_call(aid_t pid, simgrid::instr::TIData* extra); #endif