X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b0e0e572e64d092bd2be3a6ac5dfbaabd5de20b8..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/smpi/include/private.hpp diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index 4deaddd533..7174872d37 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. 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. */ @@ -31,7 +31,7 @@ constexpr unsigned MPI_REQ_MATCHED = 0x4000; constexpr unsigned MPI_REQ_CANCELLED = 0x8000; constexpr unsigned MPI_REQ_NBC = 0x10000; -enum class SmpiProcessState { UNINITIALIZED, INITIALIZING, INITIALIZED /*(=MPI_Init called)*/, FINALIZED }; +enum class SmpiProcessState { UNINITIALIZED, INITIALIZING, INITIALIZED /*(=MPI_Init called)*/, FINALIZING, FINALIZED }; constexpr int COLL_TAG_REDUCE = -112; constexpr int COLL_TAG_SCATTER = -223; @@ -57,7 +57,7 @@ constexpr int SMPI_RMA_TAG = -6666; extern XBT_PUBLIC int mpi_in_place_; extern XBT_PUBLIC int mpi_bottom_; extern XBT_PUBLIC int mpi_status_ignore_; -extern XBT_PUBLIC int mpi_statuses_ignore_; +extern XBT_PUBLIC int mpi_statuses_ignore_; /* Convert between Fortran and C */ #define FORT_ADDR(addr, val, val2) \ (((void *)(addr) == (void*) &(val2)) \ @@ -80,20 +80,21 @@ XBT_PRIVATE int smpi_get_universe_size(); XBT_PRIVATE void smpi_deployment_register_process(const std::string& instance_id, int rank, const simgrid::s4u::Actor* actor); +XBT_PRIVATE void smpi_deployment_startup_barrier(const std::string& instance_id); XBT_PRIVATE void smpi_deployment_unregister_process(const std::string& instance_id); XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const std::string& instance_id); XBT_PRIVATE void smpi_deployment_cleanup_instances(); -XBT_PRIVATE int smpi_deployment_smpirun(simgrid::s4u::Engine* e, const std::string& hostfile, int np, - const std::string& replayfile, int map, int argc, char* argv[]); +XBT_PRIVATE int smpi_deployment_smpirun(const simgrid::s4u::Engine* e, const std::string& hostfile, int np, + const std::string& replayfile, int map, + const std::vector& run_args); -XBT_PRIVATE void smpi_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, - size_t buff_size); +/** @brief Cleanup user's callback structure. Avoid segfault while destroying process */ +XBT_PRIVATE void smpi_cleanup_op_cost_callback(); XBT_PRIVATE void smpi_comm_null_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size); -XBT_PRIVATE int smpi_enabled(); XBT_PRIVATE double smpi_mpi_wtime(); XBT_PRIVATE void smpi_mpi_init(); @@ -128,8 +129,6 @@ XBT_PRIVATE void smpi_prepare_global_memory_segment(); XBT_PRIVATE void smpi_backup_global_memory_segment(); XBT_PRIVATE void smpi_destroy_global_memory_segments(); XBT_PRIVATE void smpi_bench_destroy(); -XBT_PRIVATE void smpi_bench_begin(); -XBT_PRIVATE void smpi_bench_end(); XBT_PRIVATE void smpi_shared_destroy(); XBT_PRIVATE double smpi_adjust_comp_speed(); @@ -479,6 +478,8 @@ void mpi_file_seek_(int* fh, MPI_Offset* offset, int* whence, int* ierr); void mpi_file_seek_shared_(int* fh, MPI_Offset* offset, int* whence, int* ierr); void mpi_file_get_position_(int* fh, MPI_Offset* offset, int* ierr); void mpi_file_get_position_shared_(int* fh, MPI_Offset* offset, int* ierr); +void mpi_file_set_size_(int* fh, MPI_Offset* size, int* ierr); +void mpi_file_get_size_(int* fh, MPI_Offset* sier, int* ierr); void mpi_file_set_view_(int* fh, MPI_Offset* offset, int* etype, int* filetype, char* datarep, int* info, int* ierr); void mpi_file_get_view_(int* fh, MPI_Offset* disp, int* etype, int* filetype, char *datarep, int* ierr); void mpi_file_read_(int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr); @@ -580,6 +581,15 @@ XBT_PRIVATE void private_execute_flops(double flops); #define CHECK_COMM2(num, comm)\ CHECK_MPI_NULL((num), MPI_COMM_NULL, MPI_ERR_COMM, (comm)) +#define CHECK_COLLECTIVE(comm, call) \ + { \ + if (_smpi_cfg_pedantic) { \ + std::string call_string = (call); \ + CHECK_ARGS((simgrid::smpi::utils::check_collectives_ordering((comm), call_string) != MPI_SUCCESS), \ + MPI_ERR_OTHER, "%s: collective mismatch", call_string.c_str()) \ + } \ + } + #define CHECK_DELETED(num, err, obj)\ CHECK_ARGS((obj)->deleted(), (err), "%s: param %d %s has already been freed", __func__, (num),\ _XBT_STRINGIFY(obj))